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

Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev am: 70511db961 am: fb24883149

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

Change-Id: I1ff03d122b44cf2e7446aad2ef84d2f2c4472599
This commit is contained in:
Jeff Chang
2020-07-07 01:56:27 +00:00
committed by Automerger Merge Worker
parent f9301fd850 fb24883149
commit 000b42503b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/Task.java
View File

@@ -1423,7 +1423,7 @@ class Task extends WindowContainer<WindowContainer> {
void removeChild(WindowContainer r, String reason) { void removeChild(WindowContainer r, String reason) {
// A rootable child task that is now being removed from an organized task. Making sure // A rootable child task that is now being removed from an organized task. Making sure
// the stack references is keep updated. // the stack references is keep updated.
if (mTaskOrganizer != null && mCreatedByOrganizer && r.asTask() != null) { if (mCreatedByOrganizer && r.asTask() != null) {
getDisplayArea().removeStackReferenceIfNeeded((ActivityStack) r); getDisplayArea().removeStackReferenceIfNeeded((ActivityStack) r);
} }
if (!mChildren.contains(r)) { if (!mChildren.contains(r)) {