Merge "Ensure the next activity of non-focusable task to be visible"

2020-12-11 13:48:14 +00:00
parent 513188ade3 fc165b971c
commit 3abe00f591
1 changed files with 5 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2647,7 +2647,11 @@ class ActivityStarter {
            if (next != null) {
                next.setCurrentLaunchCanTurnScreenOn(true);
            }
-            mRootWindowContainer.resumeFocusedTasksTopActivities(mTargetStack, null, mOptions);
+            if (mTargetStack.isFocusable()) {
+                mRootWindowContainer.resumeFocusedTasksTopActivities(mTargetStack, null, mOptions);
+            } else {
+                mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
+            }
        } else {
            ActivityOptions.abort(mOptions);
        }