Merge "Ensure the next activity of non-focusable task to be visible" into rvc-qpr-dev

2021-03-30 23:31:09 +00:00
parent 3e20c3e9a1 1d83fdbaf6
commit b33de1f64b
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
@@ -2545,7 +2545,11 @@ class ActivityStarter {

    private void resumeTargetStackIfNeeded() {
        if (mDoResume) {
-            mRootWindowContainer.resumeFocusedStacksTopActivities(mTargetStack, null, mOptions);
+            if (mTargetStack.isFocusable()) {
+                mRootWindowContainer.resumeFocusedStacksTopActivities(mTargetStack, null, mOptions);
+            } else {
+                mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
+            }
        } else {
            ActivityOptions.abort(mOptions);
        }