diff options
| author | Narayan Kamath <narayan@google.com> | 2018-02-19 14:09:02 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2018-02-19 14:12:01 +0000 |
| commit | 607223f3b7a1c4dc3ac995f742f8d2da50d85ffc (patch) | |
| tree | 4ca0d3ae8d23bd2056481ddcb7199e75012ed041 /core/java/android/view/DisplayInfo.java | |
| parent | 944836c6c70bb91e1520434149c630313d0b8699 (diff) | |
Remove uses of libcore.util.Objects.hashCode / equals.
Use public API in java.util.Objects instead.
Test: make
Change-Id: I413280f254743a2efa2640a2194693aeb5980605
Diffstat (limited to 'core/java/android/view/DisplayInfo.java')
| -rw-r--r-- | core/java/android/view/DisplayInfo.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java index 7251b71ac35d..913e5924c6a6 100644 --- a/core/java/android/view/DisplayInfo.java +++ b/core/java/android/view/DisplayInfo.java @@ -31,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. @@ -295,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 @@ -309,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 @@ -323,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; } |