diff options
| -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(); } |