Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix split root removed accidentally" into tm-qpr-dev am: edc6a5606e am: 4cae61b8f0

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

Change-Id: Iaa25e3470cb043fbdfeb196832aa25df26ed4750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-01 12:39:44 +00:00
committed by Automerger Merge Worker
parent 86e97fada8 4cae61b8f0
commit 8c57d06f9c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -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) {