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

Commit 59a3a2e1 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... 

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

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



Change-Id: I80ae9692e3ed222beb0aed85a5bb561d8a8c0fb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 988b4190 146a2e1a

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

+2 −2
Original line number Diff line number Diff line
@@ -2939,7 +2939,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(
@@ -2948,7 +2948,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(