commit c1082ad34dd2665844618c8c61dcdfa8ce4ad38a
author Shuzhen Wang <shuzhenwang@google.com> Wed Mar 31 00:00:02 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 31 00:00:02 2021 +0000
tree caad95b95aea4d027e3c36c0c4a7f894d58b58cb
parent b33de1f64b1206ed58c40510e0c36146442f3e8c
parent 640011569f3f96bd3ac18dda275e2e842f0e2510

Merge "Camera: Fix a removal-while-iterate bug" into rvc-qpr-dev

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

diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index 7af237b..54ad4ac 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2545,7 +2545,11 @@
 
     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);
         }