From 684f5a51b41ba326033808bad195a30775aef48a Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Fri, 4 Feb 2022 21:41:04 +0000 Subject: [PATCH] Remove instances of identical operands in binary expression These are almost certainly all bugs. Removing them and enabling the errorprone warning as an error going forward will hopefully avoid further instances creeping in to the code base. Bug: 217923092 Test: atest AdbDebuggingManagerTest AppTransitionControllerTest errorprone build Change-Id: I51fb57024eb19f1b4c96b2033bbafdb610ef2ebb --- services/Android.bp | 1 + .../java/com/android/server/wm/AppTransitionController.java | 2 +- .../src/com/android/server/adb/AdbDebuggingManagerTest.java | 2 +- .../src/com/android/server/pm/BaseShortcutManagerTest.java | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/Android.bp b/services/Android.bp index 4dcf7d4dbe8dd..1bb283ea89882 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -24,6 +24,7 @@ java_defaults { "-Xep:ArrayHashCode:ERROR", "-Xep:SelfAssignment:ERROR", "-Xep:ArrayEquals:ERROR", + "-Xep:IdentityBinaryExpression: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/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index 475a9fb36f920..457ea131a51ff 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -249,7 +249,7 @@ public class AppTransitionController { overrideWithRemoteAnimationIfSet(animLpActivity, transit, activityTypes); } - final boolean voiceInteraction = containsVoiceInteraction(mDisplayContent.mOpeningApps) + final boolean voiceInteraction = containsVoiceInteraction(mDisplayContent.mClosingApps) || containsVoiceInteraction(mDisplayContent.mOpeningApps); final int layoutRedo; diff --git a/services/tests/servicestests/src/com/android/server/adb/AdbDebuggingManagerTest.java b/services/tests/servicestests/src/com/android/server/adb/AdbDebuggingManagerTest.java index 02cf971a80768..b36aa0617be56 100644 --- a/services/tests/servicestests/src/com/android/server/adb/AdbDebuggingManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/adb/AdbDebuggingManagerTest.java @@ -635,7 +635,7 @@ public final class AdbDebuggingManagerTest { long time = System.currentTimeMillis(); for (String key : testKeys) { long connectionTime = adbKeyStore.getLastConnectionTime(key); - if (Math.abs(connectionTime - connectionTime) > epsilon) { + if (Math.abs(time - connectionTime) > epsilon) { fail("The connection time for a previously untracked key, " + connectionTime + ", is beyond the current time of " + time); } diff --git a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java index ea7804d632a5e..d99fbb12733c0 100644 --- a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java @@ -2048,8 +2048,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { protected List getShortcutAsLauncher(int targetUserId) { final ShortcutQuery q = new ShortcutQuery(); - q.setQueryFlags(ShortcutQuery.FLAG_MATCH_DYNAMIC | ShortcutQuery.FLAG_MATCH_DYNAMIC - | ShortcutQuery.FLAG_MATCH_PINNED); + q.setQueryFlags(ShortcutQuery.FLAG_MATCH_DYNAMIC | ShortcutQuery.FLAG_MATCH_PINNED); return mLauncherApps.getShortcuts(q, UserHandle.of(targetUserId)); }