Follow up to Iff58235b5bdfd0d49df259a91b05e54e3864f41c
Test: atest PhoneWindowManagerInsetsTest
Change-Id: I586d52c025ebab4146e6f03b76e6712fd97af7bf
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 473eeda..bd53420 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1205,7 +1205,7 @@
if (rotation == ROTATION_0) {
return cutout.computeSafeInsets(mInitialDisplayWidth, mInitialDisplayHeight);
}
- final boolean rotated = (rotation == ROTATION_90 || mRotation == ROTATION_270);
+ final boolean rotated = (rotation == ROTATION_90 || rotation == ROTATION_270);
final Path bounds = cutout.getBounds().getBoundaryPath();
transformPhysicalToLogicalCoordinates(rotation, mInitialDisplayWidth, mInitialDisplayHeight,
mTmpMatrix);
diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index 423be63..70e497c 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -242,7 +242,7 @@
final int appWidth = mService.mPolicy.getNonDecorDisplayWidth(dw, dh, rotation,
baseConfig.uiMode, displayId, displayCutout);
final int appHeight = mService.mPolicy.getNonDecorDisplayHeight(dw, dh, rotation,
- baseConfig.uiMode, displayId, mDisplayContent.getDisplayInfo().displayCutout);
+ baseConfig.uiMode, displayId, displayCutout);
mService.mPolicy.getNonDecorInsetsLw(rotation, dw, dh, displayCutout, mTmpRect);
final int leftInset = mTmpRect.left;
final int topInset = mTmpRect.top;