Merge "Fix split root removed accidentally" into tm-qpr-dev

2022-06-01 12:09:28 +00:00
parent f6c9abef00 8fb82cdb5d
commit edc6a5606e
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -1702,7 +1702,8 @@ class ActivityStarter {
            // Root task should also be detached from display and be removed if it's empty.
            if (startedActivityRootTask != null && startedActivityRootTask.isAttached()
                    && !startedActivityRootTask.hasActivity()
-                    && !startedActivityRootTask.isActivityTypeHome()) {
+                    && !startedActivityRootTask.isActivityTypeHome()
+                    && !startedActivityRootTask.mCreatedByOrganizer) {
                startedActivityRootTask.removeIfPossible("handleStartResult");
            }
            if (newTransition != null) {