Merge "Fix crash when changing display cutout" into rvc-dev am: 2dbd18574d

Change-Id: I795cfe4f242d7544c58c60aecaae712faa91925c
This commit is contained in:
Lucas Dupin
2020-04-15 22:05:15 +00:00
committed by Automerger Merge Worker

View File

@@ -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);