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

Commit d2101ad4 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Remove instances of identical operands in binary expression"

parents 529ee8aa 684f5a51

services/Android.bp

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

services/core/java/com/android/server/wm/AppTransitionController.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/tests/servicestests/src/com/android/server/adb/AdbDebuggingManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }

services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java

+1 −2
Original line number Diff line number Diff line
@@ -2048,8 +2048,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { 


    protected List<ShortcutInfo> 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));

    }