Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix task missing after dropped an app in PIP to enter stage split" into sc-v2-dev

Browse Source
This commit is contained in:
Jerry Chang
2021-09-16 00:21:20 +00:00
committed by Android (Google) Code Review
parent 76da258af9 a75330fa8a
commit 338f6e29db
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -30,6 +30,7 @@ import static android.app.ActivityManager.START_RETURN_LOCK_TASK_MODE_VIOLATION;
import static android.app.ActivityManager.START_SUCCESS; import static android.app.ActivityManager.START_SUCCESS;
import static android.app.ActivityManager.START_TASK_TO_FRONT; import static android.app.ActivityManager.START_TASK_TO_FRONT;
import static android.app.ActivityTaskManager.INVALID_TASK_ID; import static android.app.ActivityTaskManager.INVALID_TASK_ID;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
@@ -2698,7 +2699,11 @@ class ActivityStarter {
mStartActivity.appTimeTracker, DEFER_RESUME, mStartActivity.appTimeTracker, DEFER_RESUME,
"bringingFoundTaskToFront"); "bringingFoundTaskToFront");
mMovedToFront = !wasTopOfVisibleRootTask; mMovedToFront = !wasTopOfVisibleRootTask;
} else { } else if (intentActivity.getWindowingMode() != WINDOWING_MODE_PINNED) {
// Leaves reparenting pinned task operations to task organizer to make sure it
// dismisses pinned task properly.
// TODO(b/199997762): Consider leaving all reparent operation of organized tasks
// to task organizer.
intentTask.reparent(mTargetRootTask, ON_TOP, REPARENT_MOVE_ROOT_TASK_TO_FRONT, intentTask.reparent(mTargetRootTask, ON_TOP, REPARENT_MOVE_ROOT_TASK_TO_FRONT,
ANIMATE, DEFER_RESUME, "reparentToTargetRootTask"); ANIMATE, DEFER_RESUME, "reparentToTargetRootTask");
mMovedToFront = true; mMovedToFront = true;