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

Commit 8738ba1a 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 am: a6fb4fc4

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

Change-Id: I3006a5cdb5f5b77c59644c0f118bc8d59b7a6695
parents 0b7aa98e a6fb4fc4

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

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

            if (virtualViewId != ExploreByTouchHelper.INVALID_ID) {

                int row = (virtualViewId - VIRTUAL_BASE_VIEW_ID) / 3;

                int row = (virtualViewId - VIRTUAL_BASE_VIEW_ID) / 3;

                int col = (virtualViewId - VIRTUAL_BASE_VIEW_ID) % 3;

                int col = (virtualViewId - VIRTUAL_BASE_VIEW_ID) % 3;

                if (row < 3) {

                    return !mPatternDrawLookup[row][col];

                    return !mPatternDrawLookup[row][col];

                }

                }

            }

            return false;

            return false;

        }

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

            final Rect bounds = mTempRect;

            final int row = ordinal / 3;

            final int row = ordinal / 3;

            final int col = ordinal % 3;

            final int col = ordinal % 3;

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

            float centerX = getCenterXForColumn(col);

            float centerX = getCenterXForColumn(col);

            float centerY = getCenterYForRow(row);

            float centerY = getCenterYForRow(row);

            float cellheight = mSquareHeight * mHitFactor * 0.5f;

            float cellheight = mSquareHeight * mHitFactor * 0.5f;