Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR"

Browse Source 
automerge: 247e828

* commit '247e828b5cd63efeae3226c2a9d3bd1f466141dc':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
This commit is contained in:
Craig Mautner
2015-01-21 17:04:26 +00:00
committed by android-build-merger
parent 4af0265a35 247e828b5c
commit ad55787db2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -1553,14 +1553,14 @@ final class ActivityStack {
// Now the task above it has to return to the home task instead. // Now the task above it has to return to the home task instead.
final int taskNdx = mTaskHistory.indexOf(prevTask) + 1; final int taskNdx = mTaskHistory.indexOf(prevTask) + 1;
mTaskHistory.get(taskNdx).setTaskToReturnTo(HOME_ACTIVITY_TYPE); mTaskHistory.get(taskNdx).setTaskToReturnTo(HOME_ACTIVITY_TYPE);
} else { } else if (!isOnHomeDisplay()) {
if (DEBUG_STATES && isOnHomeDisplay()) Slog.d(TAG, return false;
} else if (!isHomeStack()){
if (DEBUG_STATES) Slog.d(TAG,
"resumeTopActivityLocked: Launching home next"); "resumeTopActivityLocked: Launching home next");
// Only resume home if on home display
final int returnTaskType = prevTask == null || !prevTask.isOverHomeStack() ? final int returnTaskType = prevTask == null || !prevTask.isOverHomeStack() ?
HOME_ACTIVITY_TYPE : prevTask.getTaskToReturnTo(); HOME_ACTIVITY_TYPE : prevTask.getTaskToReturnTo();
return isOnHomeDisplay() && return mStackSupervisor.resumeHomeStackTask(returnTaskType, prev);
mStackSupervisor.resumeHomeStackTask(returnTaskType, prev);
} }
} }