diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-08-12 00:40:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-12 00:40:50 +0000 |
| commit | 59123b9b2d7b26e7f49c77b4c62d48dc1a28518f (patch) | |
| tree | c787b730eed40b9ea2afbe8e9f10ff07726b4ddf /services | |
| parent | 15f704e70a0fc02f50f0b618b19147ca09c5e421 (diff) | |
| parent | 26ed265ceea18a42fddb95777c51a60063b0ef13 (diff) | |
| download | frameworks_base-59123b9b2d7b26e7f49c77b4c62d48dc1a28518f.zip frameworks_base-59123b9b2d7b26e7f49c77b4c62d48dc1a28518f.tar.gz frameworks_base-59123b9b2d7b26e7f49c77b4c62d48dc1a28518f.tar.bz2 | |
Merge "When closing task stack remove reference to display content." into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskStack.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 5d6df26..4db0b1e 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -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); } diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 4545032..794b49c 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -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) { |