From fc165b971c08534dd5a4e55d4b2b5fcf9b283634 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Thu, 10 Dec 2020 10:47:38 +0800 Subject: [PATCH] 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 --- .../core/java/com/android/server/wm/ActivityStarter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 1ff3a3fb1d35f..ecbf266c89cb8 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); }