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

Commit 8817872a authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Android (Google) Code Review
Browse files

Merge "Null-check on PipMenuController."

parents 22811203 ae927f97

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

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

        }



        if (mMenuActivityController != null) {

            mMenuActivityController.onTaskAppeared();

        }



        if (mShouldIgnoreEnteringPipTransition) {

            final Rect destinationBounds = mPipBoundsState.getBounds();
@@ -672,8 +674,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) {