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

Merge "Fix crash in pip task org from null params" into rvc-dev am: 3abe653962

Browse Source 
Change-Id: Ic7d6c111b9a6ea675356493bb12f6f46a985afff
This commit is contained in:
Winson Chung
2020-05-21 22:16:56 +00:00
committed by Automerger Merge Worker
parent 7200c5d597 3abe653962
commit 28ef4a671f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
View File

@@ -426,7 +426,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
public void onTaskInfoChanged(ActivityManager.RunningTaskInfo info) { public void onTaskInfoChanged(ActivityManager.RunningTaskInfo info) {
Objects.requireNonNull(mToken, "onTaskInfoChanged requires valid existing mToken"); Objects.requireNonNull(mToken, "onTaskInfoChanged requires valid existing mToken");
final PictureInPictureParams newParams = info.pictureInPictureParams; final PictureInPictureParams newParams = info.pictureInPictureParams;
if (!applyPictureInPictureParams(newParams)) { if (newParams == null || !applyPictureInPictureParams(newParams)) {
Log.d(TAG, "Ignored onTaskInfoChanged with PiP param: " + newParams); Log.d(TAG, "Ignored onTaskInfoChanged with PiP param: " + newParams);
return; return;
} }