Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove instances of identical operands in binary expression"

Browse Source
This commit is contained in:
Michael Wright
2022-02-14 14:45:08 +00:00
committed by Android (Google) Code Review
parent 529ee8aa30 684f5a51b4
commit d2101ad401
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/Android.bp
View File

@@ -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/",

2
services/core/java/com/android/server/wm/AppTransitionController.java
View File

@@ -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;

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

@@ -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);
}

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

@@ -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));
}