From 3d0235df730f9a415bced4000024715f8df4f55f Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Fri, 23 Sep 2022 01:12:27 +0800 Subject: [PATCH] Sync code with commit d582aff The code was inconsistent in different branches. Bug: 163976519 Test: WmTests Change-Id: Ib1facc373658861aa5ac2a6a4074e40c07fadd44 --- services/core/java/com/android/server/wm/ActivityStarter.java | 2 +- .../core/java/com/android/server/wm/RootWindowContainer.java | 4 ---- 2 files changed, 1 insertion(+), 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 bc1c6b2e8f3a4..7c8c27219ea53 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -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) { diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index b3f35487f3a5e..e6b1ff044d957 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 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(); }