diff options
| author | 2023-06-16 15:03:44 +0000 | |
|---|---|---|
| committer | 2023-06-16 15:03:44 +0000 | |
| commit | df26c36bf98eb99110f47f80134e7efe3ff7fa7d (patch) | |
| tree | 2f4b5b2db0a58c6855491b2f0e792187d8231500 | |
| parent | 9f7f358d6fd5faf01681f34b1612042976c3f252 (diff) | |
| parent | bf5d00ce72c7b3362daecef72d025b5979c269de (diff) | |
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>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |