commit b53d97c4571f8ed09e92eee64301969b96ff1e4d
author Craig Mautner <cmautner@google.com> Fri Oct 25 11:54:37 2013 -0700
committer Craig Mautner <cmautner@google.com> Fri Oct 25 11:54:37 2013 -0700
tree 8725857e0e9b3df39d996a6a91f2890ddf88d7c7
parent 9279d45b8d26c88c69fa917816ea396142627020

Change order of operations so flag is not overwritten

The effects of the flag, Intent.FLAG_ACTIVITY_TASK_ON_HOME was being
overwritten by the call immediately after it was set. Changing the
order of operations leaves the effect intact.

Fixes bug 11376962.

Change-Id: I27371e0efeb0c08d1e14514a9e3a63157f6d34d8

services/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index b510643..7650a65 100644
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1471,13 +1471,13 @@
                             // We really do want to push this one into the
                             // user's face, right now.
                             movedHome = true;
+                            targetStack.moveTaskToFrontLocked(intentActivity.task, r, options);
                             if ((launchFlags &
                                     (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME))
                                     == (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME)) {
                                 // Caller wants to appear on home activity.
                                 intentActivity.task.mOnTopOfHome = true;
                             }
-                            targetStack.moveTaskToFrontLocked(intentActivity.task, r, options);
                             options = null;
                         }
                     }