From 3cc84d0caa1d4c8556db1246888b9a0ce7b035b4 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Fri, 4 Feb 2022 21:05:45 +0000 Subject: [PATCH] Use Arrays.equals when comparing arrays. Objects.equals uses reference equality, we actually want the equality of the contents. Bug: 217923092 Test: errorprone build Change-Id: Idd9f515c23c6fa322b1e24101a390923993bc3dc --- services/Android.bp | 1 + .../core/java/com/android/server/display/DisplayDeviceInfo.java | 2 +- .../java/com/android/server/display/LocalDisplayAdapter.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/Android.bp b/services/Android.bp index 69733c0001943..4dcf7d4dbe8dd 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -23,6 +23,7 @@ java_defaults { "-Xep:FormatString:ERROR", "-Xep:ArrayHashCode:ERROR", "-Xep:SelfAssignment:ERROR", + "-Xep:ArrayEquals:ERROR", // NOTE: only enable to generate local patchfiles // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster", // "-XepPatchLocation:/tmp/refaster/", diff --git a/services/core/java/com/android/server/display/DisplayDeviceInfo.java b/services/core/java/com/android/server/display/DisplayDeviceInfo.java index 35e3db7832f16..a311ba1825b96 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceInfo.java +++ b/services/core/java/com/android/server/display/DisplayDeviceInfo.java @@ -418,7 +418,7 @@ final class DisplayDeviceInfo { || !Objects.equals(deviceProductInfo, other.deviceProductInfo) || ownerUid != other.ownerUid || !Objects.equals(ownerPackageName, other.ownerPackageName) - || !Objects.equals(frameRateOverrides, other.frameRateOverrides) + || !Arrays.equals(frameRateOverrides, other.frameRateOverrides) || !BrightnessSynchronizer.floatEquals(brightnessMinimum, other.brightnessMinimum) || !BrightnessSynchronizer.floatEquals(brightnessMaximum, other.brightnessMaximum) || !BrightnessSynchronizer.floatEquals(brightnessDefault, diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index a31c2314bd1ff..c02e725e4785c 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -997,7 +997,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { public boolean updateFrameRateOverridesLocked( DisplayEventReceiver.FrameRateOverride[] overrides) { - if (overrides.equals(mFrameRateOverrides)) { + if (Arrays.equals(overrides, mFrameRateOverrides)) { return false; }