Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev

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

@@ -95,7 +95,7 @@ class EnsureActivitiesVisibleHelper {
         // activities are actually behind other fullscreen activities, but still required
         // to be visible (such as performing Recents animation).
         final boolean resumeTopActivity = mTop != null && !mTop.mLaunchTaskBehind
-                && mContiner.isTopActivityFocusable()
+                && mContiner.canBeResumed(starting)
                 && (starting == null || !starting.isDescendantOf(mContiner));
 
         final PooledConsumer f = PooledLambda.obtainConsumer(

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

@@ -1963,7 +1963,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
         }
 
         try {
-            if (mStackSupervisor.realStartActivityLocked(r, app, top == r /*andResume*/,
+            if (mStackSupervisor.realStartActivityLocked(r, app,
+                    top == r && r.getTask().canBeResumed(r) /*andResume*/,
                     true /*checkConfig*/)) {
                 mTmpBoolean = true;
             }

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

@@ -3638,6 +3638,17 @@ class Task extends WindowContainer<WindowContainer> {
         return getVisibility(starting) != STACK_VISIBILITY_INVISIBLE;
     }
 
+    /**
+     * Returns {@code true} is the activity in this Task can be resumed.
+     *
+     * @param starting The currently starting activity or {@code null} if there is none.
+     */
+    boolean canBeResumed(@Nullable ActivityRecord starting) {
+        // No need to resume activity in Task that is not visible.
+        return isTopActivityFocusable()
+                && getVisibility(starting) == STACK_VISIBILITY_VISIBLE;
+    }
+
     /**
      * Returns true if the task should be visible.
      *