Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Filip Gruszczynski
2015-08-12 00:40:50 +00:00
committed by Android (Google) Code Review
parent 15f704e70a 26ed265cee
commit 59123b9b2d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/DisplayContent.java
View File

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

3
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -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) {