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

Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev

Browse Source
This commit is contained in:
Wale Ogunwale
2015-08-12 00:31:26 +00:00
committed by Android (Google) Code Review
parent 494d6e9b03 4270924801
commit e43d43c391
1 changed files with 7 additions and 3 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

@@ -3740,7 +3740,12 @@ final class ActivityStack {
if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task=" + taskId); if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task=" + taskId);
boolean prevIsHome = false; boolean prevIsHome = false;
if (tr.isOverHomeStack()) {
// If true, we should resume the home activity next if the task we are moving to the
// back is over the home stack. We force to false if the task we are moving to back
// is the home task and we don't want it resumed after moving to the back.
final boolean canGoHome = !tr.isHomeTask() && tr.isOverHomeStack();
if (canGoHome) {
final TaskRecord nextTask = getNextTask(tr); final TaskRecord nextTask = getNextTask(tr);
if (nextTask != null) { if (nextTask != null) {
nextTask.setTaskToReturnTo(tr.getTaskToReturnTo()); nextTask.setTaskToReturnTo(tr.getTaskToReturnTo());
@@ -3774,8 +3779,7 @@ final class ActivityStack {
} }
final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null; final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;
if (prevIsHome || task == tr && tr.isOverHomeStack() if (prevIsHome || (task == tr && canGoHome) || (numTasks <= 1 && isOnHomeDisplay())) {
|| numTasks <= 1 && isOnHomeDisplay()) {
if (!mService.mBooting && !mService.mBooted) { if (!mService.mBooting && !mService.mBooted) {
// Not ready yet! // Not ready yet!
return false; return false;