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

Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2015-01-22 00:25:17 +00:00
committed by Android (Google) Code Review
parent ab42bbb902 b4d43538d7
commit c79a8ea0c4
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

@@ -1525,14 +1525,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);
} }
} }