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

Merge "Fix pip activity remained in PAUSING state" into tm-qpr-dev

Browse Source
This commit is contained in:
Louis Chang
2022-07-19 00:50:30 +00:00
committed by Android (Google) Code Review
parent fecc3b1339 d64a037d41
commit f910d030b8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -3543,10 +3543,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
mRootWindowContainer.moveActivityToPinnedRootTask(r, mRootWindowContainer.moveActivityToPinnedRootTask(r,
null /* launchIntoPipHostActivity */, "enterPictureInPictureMode", null /* launchIntoPipHostActivity */, "enterPictureInPictureMode",
transition); transition);
final Task task = r.getTask();
// Continue the pausing process after entering pip. // Continue the pausing process after entering pip.
if (task.getPausingActivity() == r) { if (r.isState(PAUSING)) {
task.schedulePauseActivity(r, false /* userLeaving */, r.getTask().schedulePauseActivity(r, false /* userLeaving */,
false /* pauseImmediately */, "auto-pip"); false /* pauseImmediately */, "auto-pip");
} }
} }