diff options
| author | 2020-12-10 10:47:38 +0800 | |
|---|---|---|
| committer | 2020-12-10 18:39:36 +0800 | |
| commit | fc165b971c08534dd5a4e55d4b2b5fcf9b283634 (patch) | |
| tree | 4b9387fcd1643468c9ead6c917ab985a8b44ddb0 | |
| parent | 0d4064bd03962cfa4ae2b3f8d48b21e4696f0db0 (diff) | |
Ensure the next activity of non-focusable task to be visible
The top activity of the dock task was finished due to starting
the singleTask root activity. However, the root activity was remained
in STOPPED state because the activities in dock task cannot be
resumed while in split-screen mode.
Ensure the activity visibility if the target task is unfocusable.
Bug: 174440887
Test: start singleTask activity on dock task
Change-Id: I4f02758287ca4ef0e710bb556b5910600e725e40
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 1ff3a3fb1d35..ecbf266c89cb 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -2647,7 +2647,11 @@ class ActivityStarter { if (next != null) { next.setCurrentLaunchCanTurnScreenOn(true); } - mRootWindowContainer.resumeFocusedTasksTopActivities(mTargetStack, null, mOptions); + if (mTargetStack.isFocusable()) { + mRootWindowContainer.resumeFocusedTasksTopActivities(mTargetStack, null, mOptions); + } else { + mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); + } } else { ActivityOptions.abort(mOptions); } |