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

Commit bdd2d660 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Add null check for cutouts on display change" into main

parents 6fb1c160 a55e044b

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -520,10 +520,10 @@ public class PipController implements ConfigurationChangeListener, 
                    mPipBoundsState.getDisplayLayout().getDisplayCutout();

                    mPipBoundsState.getDisplayLayout().getDisplayCutout();

            boolean requireUnstash = false;

            boolean requireUnstash = false;

            if (mPipBoundsState.getStashedState() == PipBoundsState.STASH_TYPE_LEFT

            if (mPipBoundsState.getStashedState() == PipBoundsState.STASH_TYPE_LEFT

                    && !displayCutout.getBoundingRectLeft().isEmpty()) {

                    && displayCutout != null && !displayCutout.getBoundingRectLeft().isEmpty()) {

                requireUnstash = true;

                requireUnstash = true;

            } else if (mPipBoundsState.getStashedState() == PipBoundsState.STASH_TYPE_RIGHT

            } else if (mPipBoundsState.getStashedState() == PipBoundsState.STASH_TYPE_RIGHT

                    && !displayCutout.getBoundingRectRight().isEmpty()) {

                    && displayCutout != null && !displayCutout.getBoundingRectRight().isEmpty()) {

                requireUnstash = true;

                requireUnstash = true;

            }

            }

            if (requireUnstash) {

            if (requireUnstash) {