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

Null-check on PipMenuController.

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

Bug: 172909450
Test: None
Change-Id: I0f8a6628607568e71dab795eda255972f00c8b44
This commit is contained in:
Ben Lin
2020-11-10 11:24:45 -08:00
parent 78a4ace6db
commit ae927f9723
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

@@ -495,7 +495,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();
@@ -668,7 +670,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
mPictureInPictureParams = null;
mState = State.UNDEFINED;
mPipUiEventLoggerLogger.setTaskInfo(null);
mMenuActivityController.onTaskVanished();
if (mMenuActivityController != null) {
mMenuActivityController.onTaskVanished();
}
}
@Override