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

Revert "Recompute focus stack if cleared while starting an activity."

Browse Source 
This reverts commit 0b3d573e46.

Unfortunately, we need more than just that.

Change-Id: I42ac79cb396812b91cec67ba681144592c0e2e01
This commit is contained in:
Filip Gruszczynski
2015-06-09 15:55:30 +00:00
parent 0b3d573e46
commit 47e5331950
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1939,22 +1939,15 @@ public final class ActivityStackSupervisor implements DisplayListener {
r, top.task); r, top.task);
top.deliverNewIntentLocked(callingUid, r.intent, r.launchedFromPackage); top.deliverNewIntentLocked(callingUid, r.intent, r.launchedFromPackage);
} else { } else {
// A special case: we need to start the activity because it is not // A special case: we need to
// currently running, and the caller has asked to clear the current // start the activity because it is not currently
// task to have this activity at the top. // running, and the caller has asked to clear the
// current task to have this activity at the top.
addingToTask = true; addingToTask = true;
// Now pretend like this activity is being started by the top of its // Now pretend like this activity is being started
// task, so it is put in the right place. // by the top of its task, so it is put in the
// right place.
sourceRecord = intentActivity; sourceRecord = intentActivity;
TaskRecord task = sourceRecord.task;
if (task != null && task.stack == null) {
// Target stack got cleared when we all activities were removed
// above. Go ahead and reset it.
targetStack = computeStackFocus(sourceRecord, false /* newTask */);
targetStack.addTask(
task, !launchTaskBehind /* toTop */, false /* moving */);
}
} }
} else if (r.realActivity.equals(intentActivity.task.realActivity)) { } else if (r.realActivity.equals(intentActivity.task.realActivity)) {
// In this case the top activity on the task is the // In this case the top activity on the task is the