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

Commit deec7e48 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

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

parents 326f4505 7dd9fdfc

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