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

Commit 88b585c5 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE for user aspect ratio button in multi-window" into udc-qpr-dev

parents 5dbdd4a2 be59dd4f

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java

+4 −2
Original line number Diff line number Diff line
@@ -230,8 +230,10 @@ public class CompatUIController implements OnDisplaysChangedListener, 
            // The user aspect ratio button should not be handled when a new TaskInfo is

            // sent because of a double tap or when in multi-window mode.

            if (taskInfo.getWindowingMode() != WINDOWING_MODE_FULLSCREEN) {

                if (mUserAspectRatioSettingsLayout != null) {

                    mUserAspectRatioSettingsLayout.release();

                    mUserAspectRatioSettingsLayout = null;

                }

                return;

            }

            if (!taskInfo.isFromLetterboxDoubleTap) {