From bed538edbd9faeda923f0dc5b0eb778418ab0c62 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Wed, 21 Feb 2018 17:50:07 +0100
Subject: [PATCH] Follow up to Iff58235b5bdfd0d49df259a91b05e54e3864f41c

Test: atest PhoneWindowManagerInsetsTest
Change-Id: I586d52c025ebab4146e6f03b76e6712fd97af7bf
---
 services/core/java/com/android/server/wm/DisplayContent.java    | 2 +-
 .../com/android/server/wm/DockedStackDividerController.java     | 2 +-
 2 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 473eeda57fdec..bd53420eb9537 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 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
         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 423be6334fd8b..70e497cc68794 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 @@ public class DockedStackDividerController {
             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;