From 5364ed51b30879096e7dbd204d2526c76cfcfd0d Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Mon, 12 Jun 2023 14:38:50 -0700 Subject: Fix NPE in PipTaskOrganizer#setPipVisible Bug: 286873981 Test: N/A, fix NPE as it is Change-Id: Iae33e2d1a91603f264632e85e6fcbaaec576a7e2 --- .../Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs') diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 07d11cf9f63c..4dbb50f34a35 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -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; } -- cgit v1.2.3-59-g8ed1b