diff options
| author | Craig Mautner <cmautner@google.com> | 2014-01-10 08:40:23 -0800 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-01-10 08:40:23 -0800 |
| commit | fefeef8249e898d2d450da21d0edda49b88be7ce (patch) | |
| tree | 87cd2c37a28bd6987af6e3821678d912b1ef076a | |
| parent | b6d9eb875a0bf1bb655a90c88457689342eb0991 (diff) | |
| download | frameworks_base-fefeef8249e898d2d450da21d0edda49b88be7ce.zip frameworks_base-fefeef8249e898d2d450da21d0edda49b88be7ce.tar.gz frameworks_base-fefeef8249e898d2d450da21d0edda49b88be7ce.tar.bz2 | |
Call moveHomeStack before moving any stack.
Order matters, otherwise mFocusedStack and mLastStack aren't updated
correctly.
Fixes bug 12478856.
Change-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index adba14d..5cb0b31 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -456,11 +456,11 @@ final class ActivityStack { final void moveToFront() { if (isAttached()) { - mStacks.remove(this); - mStacks.add(this); if (isOnHomeDisplay()) { mStackSupervisor.moveHomeStack(isHomeStack()); } + mStacks.remove(this); + mStacks.add(this); } } |