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

Commit e3e960ae authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "Fix crash in pip task org from null params" into rvc-dev am: 3abe6539 am: 28ef4a67 am: ff90ee9f" into rvc-qpr-dev-plus-aosp am: 11ebd3f6

Change-Id: I856dc5a9322d449886af28a0930971c7f22a0e5d
parents 7d7e3d8c 11ebd3f6

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;

        }