diff options
| author | 2023-06-13 20:28:46 +0000 | |
|---|---|---|
| committer | 2023-06-13 20:28:46 +0000 | |
| commit | bf5d00ce72c7b3362daecef72d025b5979c269de (patch) | |
| tree | 9f1eb299ea68c4891fd4332d0e959e8aded835b6 | |
| parent | 5828f82eda19a29f672efb24d8be6dc3b96a52fa (diff) | |
| parent | 29668d515f6671b3362404f5c045ffcea8e8e342 (diff) | |
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>
| -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; } |