commit edda7e4cdb1474df0ede25953c075b3b674c38a3
author Craig Mautner <cmautner@google.com> Mon Oct 14 10:53:11 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 14 10:53:11 2013 -0700
tree 24b7de3c836ef53831c383ca4a845d754182bd3d
parent d33c97e2de9e900c9ba59119b2a38d78e2f709f5
parent 10caa3b8b1181d3dc77870487ae031a7d59f70f7

am 10caa3b8: am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front.

* commit '10caa3b8b1181d3dc77870487ae031a7d59f70f7':
  Test for task in front must include stack in front.

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

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index d1c313a..20d443b 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2628,7 +2628,7 @@
         if (task != null && task.removeActivity(r)) {
             if (DEBUG_STACK) Slog.i(TAG,
                     "removeActivityFromHistoryLocked: last activity removed from " + this);
-            if (task == topTask() && task.mOnTopOfHome) {
+            if (mStackSupervisor.isFrontStack(this) && task == topTask() && task.mOnTopOfHome) {
                 mStackSupervisor.moveHomeToTop();
             }
             mStackSupervisor.removeTask(task);