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

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

Merge "Fix parenthetical error." into klp-dev

parents 463850e0 7504d7b2

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1417,8 +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()) {

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