Merge "Fix crash when changing display cutout" into rvc-dev

2020-04-15 21:52:12 +00:00
parent 23e062deb5 46b55fe40f
commit 2dbd18574d
1 changed files with 6 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
+++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
@@ -948,7 +948,12 @@ public class ScreenDecorations extends SystemUI implements Tunable {
            int dw = flipped ? lh : lw;
            int dh = flipped ? lw : lh;

-            mBoundingPath.set(DisplayCutout.pathFromResources(getResources(), dw, dh));
+            Path path = DisplayCutout.pathFromResources(getResources(), dw, dh);
+            if (path != null) {
+                mBoundingPath.set(path);
+            } else {
+                mBoundingPath.reset();
+            }
            Matrix m = new Matrix();
            transformPhysicalToLogicalCoordinates(mInfo.rotation, dw, dh, m);
            mBoundingPath.transform(m);