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

Commit ecbdc5f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add null check for pending DisplayLayout on insetsChanged" into main

parents 7c329321 a4c84173

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+6 −0
Original line number Diff line number Diff line
@@ -632,6 +632,12 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
                    public void insetsChanged(InsetsState insetsState) {

                        DisplayLayout pendingLayout = mDisplayController

                                .getDisplayLayout(mPipDisplayLayoutState.getDisplayId());

                        if (pendingLayout == null) {

                            ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                                    "insetsChanged: no display layout for displayId=%d",

                                    mPipDisplayLayoutState.getDisplayId());

                            return;

                        }

                        if (mIsInFixedRotation

                                || mIsKeyguardShowingOrAnimating

                                || pendingLayout.rotation()