Merge "Don't create unexpected display cutout or rounded corners" into tm-dev (17267e88) · Commits · e / os / android_frameworks_base

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(