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

Commit ae927f97 authored by Ben Lin's avatar Ben Lin
Browse files

Null-check on PipMenuController. 

For now, TV PiP does not have a menu controller.

Bug: 172909450
Test: None
Change-Id: I0f8a6628607568e71dab795eda255972f00c8b44
parent 78a4ace6

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

+6 −2
Original line number Diff line number Diff line
@@ -495,7 +495,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            mOnDisplayIdChangeCallback.accept(info.displayId);

        }



        if (mMenuActivityController != null) {

            mMenuActivityController.onTaskAppeared();

        }



        if (mShouldIgnoreEnteringPipTransition) {

            final Rect destinationBounds = mPipBoundsState.getBounds();
@@ -668,8 +670,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        mPictureInPictureParams = null;

        mState = State.UNDEFINED;

        mPipUiEventLoggerLogger.setTaskInfo(null);

        if (mMenuActivityController != null) {

            mMenuActivityController.onTaskVanished();

        }

    }



    @Override

    public void onTaskInfoChanged(ActivityManager.RunningTaskInfo info) {