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

Commit 1bb526c8 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix pip activity remained in PAUSING state" into tm-qpr-dev am: f910d030 am: 86370863 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19293791



Change-Id: I7a2a0983d7c90926738e00f29c0f6b35ddf67a0b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8995a4c0 86370863

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");

                }

            }