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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-06-01 12:09:28 +00:00
committed by Android (Google) Code Review
parent f6c9abef00 8fb82cdb5d
commit edc6a5606e
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. // Root task should also be detached from display and be removed if it's empty.
if (startedActivityRootTask != null && startedActivityRootTask.isAttached() if (startedActivityRootTask != null && startedActivityRootTask.isAttached()
&& !startedActivityRootTask.hasActivity() && !startedActivityRootTask.hasActivity()
&& !startedActivityRootTask.isActivityTypeHome()) { && !startedActivityRootTask.isActivityTypeHome()
&& !startedActivityRootTask.mCreatedByOrganizer) {
startedActivityRootTask.removeIfPossible("handleStartResult"); startedActivityRootTask.removeIfPossible("handleStartResult");
} }
if (newTransition != null) { if (newTransition != null) {