From fefeef8249e898d2d450da21d0edda49b88be7ce Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Fri, 10 Jan 2014 08:40:23 -0800
Subject: [PATCH] Call moveHomeStack before moving any stack.

Order matters, otherwise mFocusedStack and mLastStack aren't updated
correctly.

Fixes bug 12478856.

Change-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2
---
 services/core/java/com/android/server/am/ActivityStack.java | 4 ++--
 1 file 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 adba14dfcd085..5cb0b31e7d049 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);
         }
     }