Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f910d030 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

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

parents fecc3b13 d64a037d

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -3543,10 +3543,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                mRootWindowContainer.moveActivityToPinnedRootTask(r,

                        null /* launchIntoPipHostActivity */, "enterPictureInPictureMode",

                        transition);

                final Task task = r.getTask();

                // Continue the pausing process after entering pip.

                if (task.getPausingActivity() == r) {

                    task.schedulePauseActivity(r, false /* userLeaving */,

                if (r.isState(PAUSING)) {

                    r.getTask().schedulePauseActivity(r, false /* userLeaving */,

                            false /* pauseImmediately */, "auto-pip");

                }

            }