diff options
Diffstat (limited to 'android/view/DisplayInfo.java')
| -rw-r--r-- | android/view/DisplayInfo.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/android/view/DisplayInfo.java b/android/view/DisplayInfo.java index 37e9815c..913e5924 100644 --- a/android/view/DisplayInfo.java +++ b/android/view/DisplayInfo.java @@ -20,6 +20,7 @@ import static android.view.DisplayInfoProto.APP_HEIGHT; import static android.view.DisplayInfoProto.APP_WIDTH; import static android.view.DisplayInfoProto.LOGICAL_HEIGHT; import static android.view.DisplayInfoProto.LOGICAL_WIDTH; +import static android.view.DisplayInfoProto.NAME; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; @@ -30,9 +31,8 @@ import android.util.ArraySet; import android.util.DisplayMetrics; import android.util.proto.ProtoOutputStream; -import libcore.util.Objects; - import java.util.Arrays; +import java.util.Objects; /** * Describes the characteristics of a particular logical display. @@ -294,8 +294,8 @@ public final class DisplayInfo implements Parcelable { && layerStack == other.layerStack && flags == other.flags && type == other.type - && Objects.equal(address, other.address) - && Objects.equal(uniqueId, other.uniqueId) + && Objects.equals(address, other.address) + && Objects.equals(uniqueId, other.uniqueId) && appWidth == other.appWidth && appHeight == other.appHeight && smallestNominalAppWidth == other.smallestNominalAppWidth @@ -308,13 +308,13 @@ public final class DisplayInfo implements Parcelable { && overscanTop == other.overscanTop && overscanRight == other.overscanRight && overscanBottom == other.overscanBottom - && Objects.equal(displayCutout, other.displayCutout) + && Objects.equals(displayCutout, other.displayCutout) && rotation == other.rotation && modeId == other.modeId && defaultModeId == other.defaultModeId && colorMode == other.colorMode && Arrays.equals(supportedColorModes, other.supportedColorModes) - && Objects.equal(hdrCapabilities, other.hdrCapabilities) + && Objects.equals(hdrCapabilities, other.hdrCapabilities) && logicalDensityDpi == other.logicalDensityDpi && physicalXDpi == other.physicalXDpi && physicalYDpi == other.physicalYDpi @@ -322,7 +322,7 @@ public final class DisplayInfo implements Parcelable { && presentationDeadlineNanos == other.presentationDeadlineNanos && state == other.state && ownerUid == other.ownerUid - && Objects.equal(ownerPackageName, other.ownerPackageName) + && Objects.equals(ownerPackageName, other.ownerPackageName) && removeMode == other.removeMode; } @@ -685,6 +685,7 @@ public final class DisplayInfo implements Parcelable { protoOutputStream.write(LOGICAL_HEIGHT, logicalHeight); protoOutputStream.write(APP_WIDTH, appWidth); protoOutputStream.write(APP_HEIGHT, appHeight); + protoOutputStream.write(NAME, name); protoOutputStream.end(token); } |