diff options
| author | 2024-07-31 09:11:59 +0000 | |
|---|---|---|
| committer | 2024-07-31 09:11:59 +0000 | |
| commit | 5780ff3e5453b985b28de85461ebe84b8d09062c (patch) | |
| tree | 94ff5ced5154fe8deedb3fedf8084413f0bad332 | |
| parent | ab4779e9007e392bb11212adf1739d053c0db45d (diff) | |
| parent | bee571de3410b9d9e682039ea8e419ad039c39b0 (diff) | |
Merge "Check precise resumable state for task overlay" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index c89f3a3a215e..cc195ac6eae4 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -2540,9 +2540,7 @@ class ActivityStarter { if (!mOptions.canTaskOverlayResume()) { final Task task = mRootWindowContainer.anyTaskForId( mOptions.getLaunchTaskId()); - final ActivityRecord top = task != null - ? task.getTopNonFinishingActivity() : null; - if (top != null && !top.isState(RESUMED)) { + if (task != null && !task.canBeResumed(r)) { // The caller specifies that we'd like to be avoided to be moved to the // front, so be it! |