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

Commit b13bc2c5 authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE going from PiP to Fullscreen." into udc-dev am: 60a246f6 am: 5cb58b2a 

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



Change-Id: I5e15ff9da56633540f97bb0370ca7e75ef1f37e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 107b3658 5cb58b2a

libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipMenuController.java

+8 −6
Original line number Diff line number Diff line
@@ -276,15 +276,14 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis 
            Rect pipBounds) {

        ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                "%s: resizePipMenu: %s", TAG, pipBounds.toShortString());



        if (pipBounds.isEmpty()) {

            return;

        }



        if (!isMenuReadyToMove()) {

        if (!isMenuAttached()) {

            return;

        }





        final SurfaceControl frontSurface = getSurfaceControl(mPipMenuView);

        final SurfaceControl backSurface = getSurfaceControl(mPipBackgroundView);

        final Rect menuBounds = calculateMenuSurfaceBounds(pipBounds);
@@ -321,7 +320,7 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis 
            }

            return;

        }

        if (!isMenuReadyToMove()) {

        if (!isMenuAttached()) {

            return;

        }
@@ -344,12 +343,12 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis 
        syncGroup.markSyncReady();

    }



    private boolean isMenuReadyToMove() {

    private boolean isMenuAttached() {

        final boolean ready = mPipMenuView != null && mPipMenuView.getViewRootImpl() != null

                && mPipBackgroundView != null && mPipBackgroundView.getViewRootImpl() != null;

        if (!ready) {

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: Not going to move PiP, either menu or its parent is not created.", TAG);

                    "%s: the menu surfaces are not attached.", TAG);

        }

        return ready;

    }
@@ -368,6 +367,9 @@ public class TvPipMenuController implements PipMenuController, TvPipMenuView.Lis 


    @Override

    public void updateMenuBounds(Rect pipBounds) {

        if (!isMenuAttached()) {

            return;

        }

        final Rect menuBounds = calculateMenuSurfaceBounds(pipBounds);

        ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                "%s: updateMenuBounds: %s", TAG, menuBounds.toShortString());