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

am deec7e48: Merge "Put next task on top of stack if top is finishing." into klp-dev

Browse Source 
* commit 'deec7e481a403749ec3977c946192abbc5c5501e':
  Put next task on top of stack if top is finishing.
This commit is contained in:
Craig Mautner
2013-09-16 14:27:15 -07:00
committed by Android Git Automerger
parent bac2fcacbe deec7e481a
commit 660a7fdef3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1417,7 +1417,8 @@ public final class ActivityStackSupervisor {
final ActivityStack lastStack = getLastStack(); final ActivityStack lastStack = getLastStack();
ActivityRecord curTop = lastStack == null? ActivityRecord curTop = lastStack == null?
null : lastStack.topRunningNonDelayedActivityLocked(notTop); null : lastStack.topRunningNonDelayedActivityLocked(notTop);
if (curTop != null && curTop.task != intentActivity.task) { if (curTop != null && (curTop.task != intentActivity.task) ||
curTop.task != lastStack.topTask()) {
r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
if (sourceRecord == null || (sourceStack.topActivity() != null && if (sourceRecord == null || (sourceStack.topActivity() != null &&
sourceStack.topActivity().task == sourceRecord.task)) { sourceStack.topActivity().task == sourceRecord.task)) {