Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cc84d0c authored Feb 04, 2022 by Michael Wright

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

parent 573d22a9

services/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -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/",

services/core/java/com/android/server/display/DisplayDeviceInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,

services/core/java/com/android/server/display/LocalDisplayAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}