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

Commit ef310351 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e5 

Change-Id: I9c2057452199f9546b14a73a035fe8c30e7169fd
parents 1f3dceb4 495fd8e5

services/core/java/com/android/server/wm/ActivityRecord.java

+3 −0
Original line number Diff line number Diff line
@@ -5526,6 +5526,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // timeout should not be caused by this.

        if (stopped) {

            final ActivityStack stack = mRootWindowContainer.getTopDisplayFocusedStack();

            if (stack == null) {

                return this;

            }

            // Try to use the one which is closest to top.

            ActivityRecord r = stack.getResumedActivity();

            if (r == null) {

services/core/java/com/android/server/wm/ActivityStarter.java

+1 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ class ActivityStarter { 


        // If we are starting an activity that is not from the same uid as the currently resumed

        // one, check whether app switches are allowed.

        if (voiceSession == null && (stack.getResumedActivity() == null

        if (voiceSession == null && stack != null && (stack.getResumedActivity() == null

                || stack.getResumedActivity().info.applicationInfo.uid != realCallingUid)) {

            if (!mService.checkAppSwitchAllowedLocked(callingPid, callingUid,

                    realCallingPid, realCallingUid, "Activity start")) {