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

Commit be59dd4f authored by Massimo Carli's avatar Massimo Carli
Browse files

Fix NPE for user aspect ratio button in multi-window 

Fix: 296852036
Test: atest WMShellUnitTests:CompatUIControllerTest

Change-Id: Ie73d4fc8e6127b53d5f934f277a79c6c5bff46cc
parent 08497eca

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