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

Merge "Sync code with commit d582aff"

Browse Source
This commit is contained in:
Riddle Hsu
2022-09-23 10:09:03 +00:00
committed by Android (Google) Code Review
parent 8c878f6b9e 3d0235df73
commit a4c363611e
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1848,7 +1848,7 @@ class ActivityStarter {
ActivityRecord targetTopActivity =
targetTask != null ? targetTask.getTopNonFinishingActivity() : null;
boolean passesAsmChecks = newTask
? mRootWindowContainer.hasResumedActivity(callerUid)
? mService.mVisibleActivityProcessTracker.hasResumedActivity(callerUid)
: targetTopActivity != null && targetTopActivity.getUid() == callerUid;
if (!passesAsmChecks) {

4
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -1799,10 +1799,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
return getItemFromTaskDisplayAreas(TaskDisplayArea::getFocusedActivity);
}
boolean hasResumedActivity(int uid) {
return forAllActivities(ar -> ar.isState(RESUMED) && ar.getUid() == uid);
}
boolean isTopDisplayFocusedRootTask(Task task) {
return task != null && task == getTopDisplayFocusedRootTask();
}