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

Commit 77346784 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Reset supportsEnterPipOnTaskSwitch when paused" into main

parents 41f071c4 2f425ca9

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

+0 −6
Original line number Diff line number Diff line
@@ -6005,12 +6005,6 @@ final class ActivityRecord extends WindowToken { 
            setVisibility(false);



            switch (mState) {

                case STOPPING:

                case STOPPED:

                    // Reset the flag indicating that an app can enter picture-in-picture once the

                    // activity is hidden

                    supportsEnterPipOnTaskSwitch = false;

                    break;

                case RESUMED:

                case INITIALIZING:

                case PAUSING:

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

+1 −0
Original line number Diff line number Diff line
@@ -2062,6 +2062,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { 


        if (prev != null) {

            prev.setWillCloseOrEnterPip(false);

            prev.supportsEnterPipOnTaskSwitch = false;

            final boolean wasStopping = prev.isState(STOPPING);

            prev.setState(PAUSED, "completePausedLocked");

            mPausingActivity = null;