Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e424b7c authored by Ching Tzung Lin's avatar Ching Tzung Lin Committed by android-build-merger
Browse files

Merge "Factor chin size into dimension checking to determine if... 

Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev am: e94b3ba0 am: 9cae56e7
am: d7f0a33b

* commit 'd7f0a33b':
  Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.
parents f8ae610e d7f0a33b

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

+1 −1
Original line number Diff line number Diff line
@@ -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;