From 274239d938963d2b15e7e62c7b96ce910a02376b Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Tue, 15 Dec 2020 14:31:43 +0800 Subject: [PATCH] Correct annotation of ActivityOptions.SourceInfo.SourceType The field only presents one type, so it should not be a flag. Also correct a typo comma. Bug: 174237260 Test: build Change-Id: I7bd1cf0778fc8c11f3ff9dfcbc32129a6b74821b --- core/java/android/app/ActivityOptions.java | 2 +- .../java/com/android/server/wm/RecentsAnimationController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 0b0781e917e3b..a2b9157e5454e 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1878,7 +1878,7 @@ public class ActivityOptions { /** Launched from recents gesture handler. */ public static final int TYPE_RECENTS_ANIMATION = 4; - @IntDef(flag = true, prefix = { "TYPE_" }, value = { + @IntDef(prefix = { "TYPE_" }, value = { TYPE_LAUNCHER, TYPE_NOTIFICATION, TYPE_LOCKSCREEN, diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java index edd01ebee42f1..af9069f1e71f1 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimationController.java +++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java @@ -88,7 +88,7 @@ public class RecentsAnimationController implements DeathRecipient { private static final long FAILSAFE_DELAY = 1000; /** * If the recents animation is canceled before the delay since the window drawn, do not log the - * action because the duration is too small that may be just a mistouch, + * action because the duration is too small that may be just a mistouch. */ private static final long LATENCY_TRACKER_LOG_DELAY_MS = 300;