Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cae61b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670838



Change-Id: I3cf0e76a6a65ae1896fd1cbc7c7df710e0603ecf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9bec8bb6 edc6a560

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

+2 −1
Original line number Diff line number Diff line
@@ -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) {