Merge "Correct annotation of ActivityOptions.SourceInfo.SourceType"

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,

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;