Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joe Bolinger
2021-06-23 21:25:03 +00:00
committed by Android (Google) Code Review
parent 3e51f7cabd a16f4f21b2
commit aa910853fb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/widget/LockPatternView.java
View File

@@ -1524,7 +1524,9 @@ 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;
return !mPatternDrawLookup[row][col]; if (row < 3) {
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;