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

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

am a546e5be: am ba1e3915: am 59123b9b: Merge "When closing task stack remove... 

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

* commit 'a546e5be':
  When closing task stack remove reference to display content.
parents 4ce98e4e a546e5be

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

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

    }





    void moveStack(TaskStack stack, boolean toTop) {

    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);

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

    }

    }

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

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

        }





        close();

        close();



        mDisplayContent = null;

    }

    }





    void resetAnimationBackgroundAnimator() {

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

            mDimLayer.destroySurface();

            mDimLayer = null;

            mDimLayer = null;

        }

        }

        mDisplayContent = null;

    }

    }





    public void dump(String prefix, PrintWriter pw) {

    public void dump(String prefix, PrintWriter pw) {