Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I30e7ad51936782f2ed029c5aa674e9585f86aef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lin
2022-05-06 15:54:53 +00:00
committed by Automerger Merge Worker
parent c1dd3c2782 3026c72f44
commit 146a2e1a2f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -2939,7 +2939,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
} }
DisplayCutout loadDisplayCutout(int displayWidth, int displayHeight) { DisplayCutout loadDisplayCutout(int displayWidth, int displayHeight) {
if (mDisplayPolicy == null) { if (mDisplayPolicy == null || mInitialDisplayCutout == null) {
return null; return null;
} }
return DisplayCutout.fromResourcesRectApproximation( return DisplayCutout.fromResourcesRectApproximation(
@@ -2948,7 +2948,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
} }
RoundedCorners loadRoundedCorners(int displayWidth, int displayHeight) { RoundedCorners loadRoundedCorners(int displayWidth, int displayHeight) {
if (mDisplayPolicy == null) { if (mDisplayPolicy == null || mInitialRoundedCorners == null) {
return null; return null;
} }
return RoundedCorners.fromResources( return RoundedCorners.fromResources(