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

Commit 7b8b330d authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Set isInPictureInPictureMode earlier" into rvc-dev am: 3da602b6 am: d1bc4769

Change-Id: I24e2d074b273cf7668592252df08f17d41e55943
parents 9bcefa66 d1bc4769
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -2838,7 +2838,13 @@ public class Activity extends ContextThemeWrapper
                throw new IllegalStateException("Activity must be resumed to enter"
                        + " picture-in-picture");
            }
            return ActivityTaskManager.getService().enterPictureInPictureMode(mToken, params);
            // Set mIsInPictureInPictureMode earlier and don't wait for
            // onPictureInPictureModeChanged callback here. This is to ensure that
            // isInPictureInPictureMode returns true in the following onPause callback.
            // See https://developer.android.com/guide/topics/ui/picture-in-picture for guidance.
            mIsInPictureInPictureMode = ActivityTaskManager.getService().enterPictureInPictureMode(
                    mToken, params);
            return mIsInPictureInPictureMode;
        } catch (RemoteException e) {
            return false;
        }