diff options
| author | Craig Mautner <cmautner@google.com> | 2014-01-10 16:46:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-10 16:46:43 +0000 |
| commit | 88a00abe0803327bb55171082e18fe2901c35d49 (patch) | |
| tree | 51bb8d0cec683ff4038a65588216d48aecffc025 | |
| parent | a3040e8d5d5441c86eb251801f0200718bab68ee (diff) | |
| parent | 0bb2a4deee6451a2f3075254761e9bfb38429fa4 (diff) | |
| download | frameworks_base-88a00abe0803327bb55171082e18fe2901c35d49.zip frameworks_base-88a00abe0803327bb55171082e18fe2901c35d49.tar.gz frameworks_base-88a00abe0803327bb55171082e18fe2901c35d49.tar.bz2 | |
am 0bb2a4de: Merge "Call moveHomeStack before moving any stack." into klp-modular-dev
* commit '0bb2a4deee6451a2f3075254761e9bfb38429fa4':
Call moveHomeStack before moving any stack.
| -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 125621a..6078611 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -458,11 +458,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); } } |