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

Commit 851aec7f authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix stack reference is not updated when task organizer is dead." into... 

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

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

Change-Id: I02c123b1f137138e9094f74ec0ae4b255b499bdf
parents 32f63241 df66826e

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

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