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

Commit 59123b9b authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "When closing task stack remove reference to display content." into mnc-dev

parents 15f704e7 26ed265c

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

+3 −1
Original line number Diff line number Diff line
@@ -203,7 +203,9 @@ class DisplayContent { 
    }



    void moveStack(TaskStack stack, boolean toTop) {

        mStacks.remove(stack);

        if (!mStacks.remove(stack)) {

            Slog.wtf(TAG, "moving stack that was not added: " + stack, new Throwable());

        }

        mStacks.add(toTop ? mStacks.size() : 0, stack);

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -385,8 +385,6 @@ public class TaskStack { 
        }



        close();



        mDisplayContent = null;

    }



    void resetAnimationBackgroundAnimator() {
@@ -518,6 +516,7 @@ public class TaskStack { 
            mDimLayer.destroySurface();

            mDimLayer = null;

        }

        mDisplayContent = null;

    }



    public void dump(String prefix, PrintWriter pw) {