Fix crash in pip task org from null params

Bug: 156314330
Test: atest PinnedStackTests
Change-Id: I8094c7e29552327f1dd69b4a54c9979d36e57c8b
This commit is contained in:
Winson Chung
2020-05-21 11:27:28 -07:00
parent 92d678d8ad
commit 6d8a195656

View File

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