From 9c57af4c5a7c8b09c52d2cdb5588178ebb863379 Mon Sep 17 00:00:00 2001
From: Ching Tzung Lin <ctlin@google.com>
Date: Thu, 22 Oct 2015 15:02:57 -0700
Subject: [PATCH] Factor chin size into dimension checking to determine if
 CircularDisplayMask can be turned on.

Bug:24797866
Change-Id: I1b8061a8d00dca1877c1360f6fab228a1d72a70a
---
 .../core/java/com/android/server/wm/CircularDisplayMask.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/CircularDisplayMask.java b/services/core/java/com/android/server/wm/CircularDisplayMask.java
index 7c2da2dc292e5..be3e922ad7a6b 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 @@ class CircularDisplayMask {
             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;