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

Sync code with commit d582aff

Browse Source 
The code was inconsistent in different branches.

Bug: 163976519
Test: WmTests
Change-Id: Ib1facc373658861aa5ac2a6a4074e40c07fadd44
This commit is contained in:
Riddle Hsu
2022-09-23 01:12:27 +08:00
parent 520f0183b6
commit 3d0235df73
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

@@ -1847,7 +1847,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();
}