Merge "Fix NPE in PipTaskOrganizer#setPipVisible" into udc-dev am: 29668d515f am: bf5d00ce72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23665533 Change-Id: Ie24a9f1d0fe3fb468fd1d212dbdee27590848d57 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) {
|
||||
ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
|
||||
"setPipVisibility: %s, state=%s visible=%s",
|
||||
mTaskInfo.topActivity, mPipTransitionState, visible);
|
||||
(mTaskInfo != null ? mTaskInfo.topActivity : null), mPipTransitionState, visible);
|
||||
if (!isInPip()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user