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

Commit 3e124d04 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Don't create unexpected display cutout or rounded corners" into tm-dev am: 17267e88 

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



Change-Id: I8104c55c10d173e8a74fcbc72023d30a36074bc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2621addc 17267e88

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

+2 −2
Original line number Diff line number Diff line
@@ -2922,7 +2922,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    }



    DisplayCutout loadDisplayCutout(int displayWidth, int displayHeight) {

        if (mDisplayPolicy == null) {

        if (mDisplayPolicy == null || mInitialDisplayCutout == null) {

            return null;

        }

        return DisplayCutout.fromResourcesRectApproximation(
@@ -2931,7 +2931,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    }



    RoundedCorners loadRoundedCorners(int displayWidth, int displayHeight) {

        if (mDisplayPolicy == null) {

        if (mDisplayPolicy == null || mInitialRoundedCorners == null) {

            return null;

        }

        return RoundedCorners.fromResources(