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: 1575740081

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

Change-Id: I36e9652f93a012eb9f7dfc9307b74f28327a8a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lin
2022-05-06 14:18:33 +00:00
committed by Automerger Merge Worker
parent 54638f5a9e 1575740081
commit 3faa9684b9
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) {
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(