Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Null-check on PipMenuController."

Browse Source
This commit is contained in:
Sergey Nikolaienkov
2020-11-10 22:31:42 +00:00
committed by Android (Google) Code Review
parent 22811203c9 ae927f9723
commit 8817872a73
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -501,7 +501,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
mOnDisplayIdChangeCallback.accept(info.displayId);
}
mMenuActivityController.onTaskAppeared();
if (mMenuActivityController != null) {
mMenuActivityController.onTaskAppeared();
}
if (mShouldIgnoreEnteringPipTransition) {
final Rect destinationBounds = mPipBoundsState.getBounds();
@@ -672,7 +674,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
mPictureInPictureParams = null;
mState = State.UNDEFINED;
mPipUiEventLoggerLogger.setTaskInfo(null);
mMenuActivityController.onTaskVanished();
if (mMenuActivityController != null) {
mMenuActivityController.onTaskVanished();
}
}
@Override