diff options
| author | 2020-07-07 01:56:21 +0000 | |
|---|---|---|
| committer | 2020-07-07 01:56:21 +0000 | |
| commit | 851aec7f751526ddcc65ad592ed4eb519874549b (patch) | |
| tree | 0cef92a522c1a0d34027f6450077d6f2f40e418d | |
| parent | 32f6324141e2e41115fab10cf7b9d0a2ba87e448 (diff) | |
| parent | df66826e9aaecfa1a3231c43b137c1444a627184 (diff) | |
Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev am: 70511db961 am: df66826e9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12068938
Change-Id: I02c123b1f137138e9094f74ec0ae4b255b499bdf
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index c664a841fc1f..6785127d5953 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1423,7 +1423,7 @@ class Task extends WindowContainer<WindowContainer> { void removeChild(WindowContainer r, String reason) { // A rootable child task that is now being removed from an organized task. Making sure // the stack references is keep updated. - if (mTaskOrganizer != null && mCreatedByOrganizer && r.asTask() != null) { + if (mCreatedByOrganizer && r.asTask() != null) { getDisplayArea().removeStackReferenceIfNeeded((ActivityStack) r); } if (!mChildren.contains(r)) { |