commit 9c57af4c5a7c8b09c52d2cdb5588178ebb863379
author Ching Tzung Lin <ctlin@google.com> Thu Oct 22 15:02:57 2015 -0700
committer Ching Tzung Lin <ctlin@google.com> Thu Oct 22 15:14:48 2015 -0700
tree fd96ca0d8407bdb2d714671d49c03dc9adac6807
parent 9e30c4b4062296bd1eb918d20b6f28032644d820

Factor chin size into dimension checking to determine if
CircularDisplayMask can be turned on.

Bug:24797866
Change-Id: I1b8061a8d00dca1877c1360f6fab228a1d72a70a

services/core/java/com/android/server/wm/CircularDisplayMask.java

diff --git a/services/core/java/com/android/server/wm/CircularDisplayMask.java b/services/core/java/com/android/server/wm/CircularDisplayMask.java
index 7c2da2d..be3e922 100644
--- a/services/core/java/com/android/server/wm/CircularDisplayMask.java
+++ b/services/core/java/com/android/server/wm/CircularDisplayMask.java
@@ -56,7 +56,7 @@
             int screenOffset, int maskThickness) {
         mScreenSize = new Point();
         display.getSize(mScreenSize);
-        if (mScreenSize.x != mScreenSize.y) {
+        if (mScreenSize.x != mScreenSize.y + screenOffset) {
             Slog.w(TAG, "Screen dimensions of displayId = " + display.getDisplayId() +
                     "are not equal, circularMask will not be drawn.");
             mDimensionsUnequal = true;