diff options
| author | 2022-09-23 10:09:03 +0000 | |
|---|---|---|
| committer | 2022-09-23 10:09:03 +0000 | |
| commit | a4c363611e68f47301672b466767d4bccb949eb8 (patch) | |
| tree | 5f4ea66adacdf828204b7465dad9a7641da81a76 | |
| parent | 8c878f6b9ee7a2dbfbe8c621e8e68ee6e8b5fee5 (diff) | |
| parent | 3d0235df730f9a415bced4000024715f8df4f55f (diff) | |
Merge "Sync code with commit d582aff"
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index a0a4f760a889..1d70146d5183 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -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) { diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index f66ba383b44f..ba834def88c7 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -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(); } |