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

Commit 471dd6dd authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24497530



Change-Id: I63f33686bb291aaa7ecb9fcadbcf17f80076d97b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b06bf4ac 88b585c5

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) {