Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in PipTaskOrganizer#setPipVisible" into udc-dev am: 29668d515f am: bf5d00ce72

Browse Source 
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:
Hongwei Wang
2023-06-16 15:03:44 +00:00
committed by Automerger Merge Worker
parent 9f7f358d6f bf5d00ce72
commit df26c36bf9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
View File

@@ -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;
} }