Merge "Fix NPE in PipTaskOrganizer#setPipVisible" into udc-dev am: 29668d515f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23665533 Change-Id: Iec734ca8f05d9073b6cc8dc88e923781c1fd206f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1146,7 +1146,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
|
|||||||
public void setPipVisibility(boolean visible) {
|
public void setPipVisibility(boolean visible) {
|
||||||
ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
|
ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
|
||||||
"setPipVisibility: %s, state=%s visible=%s",
|
"setPipVisibility: %s, state=%s visible=%s",
|
||||||
mTaskInfo.topActivity, mPipTransitionState, visible);
|
(mTaskInfo != null ? mTaskInfo.topActivity : null), mPipTransitionState, visible);
|
||||||
if (!isInPip()) {
|
if (!isInPip()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user