Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 660a7fde authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit 'deec7e48':
  Put next task on top of stack if top is finishing.
parents bac2fcac deec7e48

services/java/com/android/server/am/ActivityStackSupervisor.java

+2 −1
Original line number Diff line number Diff line
@@ -1417,7 +1417,8 @@ public final class ActivityStackSupervisor { 
                    final ActivityStack lastStack = getLastStack();

                    ActivityRecord curTop = lastStack == null?

                            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);

                        if (sourceRecord == null || (sourceStack.topActivity() != null &&

                                sourceStack.topActivity().task == sourceRecord.task)) {