Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff90ee9f authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

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

Change-Id: I4fb9047f1fd007fe660835e462751342d0c888b8
parents 7f62f74e 28ef4a67

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }