commit ad55787db2f9e4b56a8406026566564d6aa08d5a
author Craig Mautner <cmautner@google.com> Wed Jan 21 17:04:26 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 21 17:04:26 2015 +0000
tree 46cf50b88cfce46bde3df7a576ec9dfde48c6667
parent 4af0265a35bcd8a0a7513dd85fe371597e2038c5
parent 247e828b5cd63efeae3226c2a9d3bd1f466141dc

Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR"
automerge: 247e828

* commit '247e828b5cd63efeae3226c2a9d3bd1f466141dc':
  [ActivityManager] No home activity resumed and cause key dispatch ANR

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index c03dbc2..152f8d7 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1553,14 +1553,14 @@
                 // Now the task above it has to return to the home task instead.
                 final int taskNdx = mTaskHistory.indexOf(prevTask) + 1;
                 mTaskHistory.get(taskNdx).setTaskToReturnTo(HOME_ACTIVITY_TYPE);
-            } else {
-                if (DEBUG_STATES && isOnHomeDisplay()) Slog.d(TAG,
+            } else if (!isOnHomeDisplay()) {
+                return false;
+            } else if (!isHomeStack()){
+                if (DEBUG_STATES) Slog.d(TAG,
                         "resumeTopActivityLocked: Launching home next");
-                // Only resume home if on home display
                 final int returnTaskType = prevTask == null || !prevTask.isOverHomeStack() ?
                         HOME_ACTIVITY_TYPE : prevTask.getTaskToReturnTo();
-                return isOnHomeDisplay() &&
-                        mStackSupervisor.resumeHomeStackTask(returnTaskType, prev);
+                return mStackSupervisor.resumeHomeStackTask(returnTaskType, prev);
             }
         }