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

Commit f0f63541 authored by Kazuki Takise's avatar Kazuki Takise Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in DesktopAppCompatAspectRatioPolicy" into main

parents 897f2bf2 3cb6fc42

services/core/java/com/android/server/wm/DesktopAppCompatAspectRatioPolicy.java

+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ public class DesktopAppCompatAspectRatioPolicy { 
        final DisplayContent dc = task.mDisplayContent;

        final int windowingMode = task.getDisplayArea().getWindowingMode();

        return WindowConfiguration.inMultiWindowMode(windowingMode)

                && !dc.getIgnoreOrientationRequest();

                && dc != null && !dc.getIgnoreOrientationRequest();

    }



    /**
@@ -299,6 +299,7 @@ public class DesktopAppCompatAspectRatioPolicy { 
        return mAppCompatOverrides.getAspectRatioOverrides()

                    .getAllowUserAspectRatioOverridePropertyValue()

                && mAppCompatConfiguration.isUserAppAspectRatioSettingsEnabled()

                && task.mDisplayContent != null

                && task.mDisplayContent.getIgnoreOrientationRequest();

    }