Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Protect against assumptions of a top focused stack." into rvc-dev

Browse Source
This commit is contained in:
Jeff Chang
2020-05-03 15:52:07 +00:00
committed by Android (Google) Code Review
parent aeae048088 51de04a67d
commit 495fd8e549
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityRecord.java
View File

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

2
services/core/java/com/android/server/wm/ActivityStarter.java
View File

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