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

Commit f0d15a75 authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android Git Automerger
Browse files

am d994c254: am d200aa4c: am a546e5be: am ba1e3915: am 59123b9b: Merge "When... 

am d994c254: am d200aa4c: am a546e5be: am ba1e3915: am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev

* commit 'd994c254':
  When closing task stack remove reference to display content.
parents e337bd50 d994c254

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

+3 −1
Original line number Diff line number Diff line
@@ -208,7 +208,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
@@ -318,8 +318,6 @@ public class TaskStack implements DimLayer.DimLayerUser { 
        }



        close();



        mDisplayContent = null;

    }



    void resetAnimationBackgroundAnimator() {
@@ -358,6 +356,7 @@ public class TaskStack implements DimLayer.DimLayerUser { 
        for (int taskNdx = mTasks.size() - 1; taskNdx >= 0; --taskNdx) {

            mTasks.get(taskNdx).close();

        }

        mDisplayContent = null;

    }



    public void dump(String prefix, PrintWriter pw) {