diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 2975a95426bb..d0baa238f732 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -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( |