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

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

Merge "Use correct stacks for testing changes."

parents 7ffb2fb3 165640bb

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

+2 −2
Original line number Diff line number Diff line
@@ -2412,7 +2412,7 @@ final class ActivityStack { 
            if (r.finishing) {

                finishCurrentActivityLocked(r, FINISH_IMMEDIATELY, false);

            } else {

                stopActivityLocked(r);

                r.task.stack.stopActivityLocked(r);

            }

        }
@@ -2420,7 +2420,7 @@ final class ActivityStack { 
        // waiting for the next one to start.

        for (int i = 0; i < NF; i++) {

            r = finishes.get(i);

            activityRemoved |= destroyActivityLocked(r, true, false, "finish-idle");

            activityRemoved |= r.task.stack.destroyActivityLocked(r, true, false, "finish-idle");

        }



        if (booting) {

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

+3 −2
Original line number Diff line number Diff line
@@ -1212,8 +1212,9 @@ public class ActivityStackSupervisor { 
                    // to have the same behavior as if a new instance was

                    // being started, which means not bringing it to the front

                    // if the caller is not itself in the front.

                    ActivityRecord curTop =

                            targetStack.topRunningNonDelayedActivityLocked(notTop);

                    final ActivityStack lastStack = getLastStack();

                    ActivityRecord curTop = lastStack == null?

                            null : lastStack.topRunningNonDelayedActivityLocked(notTop);

                    if (curTop != null && curTop.task != intentActivity.task) {

                        r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);

                        if (sourceRecord == null || sourceStack.topActivity() == sourceRecord) {