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

Commit f45efd5c authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when BiometricPrompt requests swipe pattern and talk back is... 

Merge "Fix crash when BiometricPrompt requests swipe pattern and talk back is enabled." into sc-dev am: aa910853

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15053960

Change-Id: Ib2b00c45b45cba9b4311fb20a925f48955c80eb8
parents f811370b aa910853

core/java/com/android/internal/widget/LockPatternView.java

+3 −2
Original line number Diff line number Diff line
@@ -1524,8 +1524,10 @@ public class LockPatternView extends View { 
            if (virtualViewId != ExploreByTouchHelper.INVALID_ID) {

                int row = (virtualViewId - VIRTUAL_BASE_VIEW_ID) / 3;

                int col = (virtualViewId - VIRTUAL_BASE_VIEW_ID) % 3;

                if (row < 3) {

                    return !mPatternDrawLookup[row][col];

                }

            }

            return false;

        }
@@ -1570,7 +1572,6 @@ public class LockPatternView extends View { 
            final Rect bounds = mTempRect;

            final int row = ordinal / 3;

            final int col = ordinal % 3;

            final CellState cell = mCellStates[row][col];

            float centerX = getCenterXForColumn(col);

            float centerY = getCenterYForRow(row);

            float cellheight = mSquareHeight * mHitFactor * 0.5f;