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

Commit 56a28f70 authored by Craig Mautner's avatar Craig Mautner Committed by The Android Automerger
Browse files

Fix parenthetical error. 

Mis-grouping of && and || from CL ag/360551.

Fixes bug 10798273.

Change-Id: Idbc77e03d09f7ad5fcf1a5de98c6c14f0c63a6e4
parent 2cdb82d1

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