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

Merge "Fix NPEs in AuthContainerView" into tm-qpr-dev

Browse Source
This commit is contained in:
Ilya Matyukhin
2022-08-31 22:53:15 +00:00
committed by Android (Google) Code Review
parent 5effdf21e3 8521088007
commit b8713e8713
1 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
View File

@@ -657,30 +657,50 @@ public class AuthContainerView extends LinearLayout
@Override @Override
public void onAuthenticationSucceeded(@Modality int modality) { public void onAuthenticationSucceeded(@Modality int modality) {
mBiometricView.onAuthenticationSucceeded(modality); if (mBiometricView != null) {
mBiometricView.onAuthenticationSucceeded(modality);
} else {
Log.e(TAG, "onAuthenticationSucceeded(): mBiometricView is null");
}
} }
@Override @Override
public void onAuthenticationFailed(@Modality int modality, String failureReason) { public void onAuthenticationFailed(@Modality int modality, String failureReason) {
mFailedModalities.add(modality); if (mBiometricView != null) {
mBiometricView.onAuthenticationFailed(modality, failureReason); mFailedModalities.add(modality);
mBiometricView.onAuthenticationFailed(modality, failureReason);
} else {
Log.e(TAG, "onAuthenticationFailed(): mBiometricView is null");
}
} }
@Override @Override
public void onHelp(@Modality int modality, String help) { public void onHelp(@Modality int modality, String help) {
mBiometricView.onHelp(modality, help); if (mBiometricView != null) {
mBiometricView.onHelp(modality, help);
} else {
Log.e(TAG, "onHelp(): mBiometricView is null");
}
} }
@Override @Override
public void onError(@Modality int modality, String error) { public void onError(@Modality int modality, String error) {
mBiometricView.onError(modality, error); if (mBiometricView != null) {
mBiometricView.onError(modality, error);
} else {
Log.e(TAG, "onError(): mBiometricView is null");
}
} }
@Override @Override
public void onPointerDown() { public void onPointerDown() {
if (mBiometricView.onPointerDown(mFailedModalities)) { if (mBiometricView != null) {
Log.d(TAG, "retrying failed modalities (pointer down)"); if (mBiometricView.onPointerDown(mFailedModalities)) {
mBiometricCallback.onAction(AuthBiometricView.Callback.ACTION_BUTTON_TRY_AGAIN); Log.d(TAG, "retrying failed modalities (pointer down)");
mBiometricCallback.onAction(AuthBiometricView.Callback.ACTION_BUTTON_TRY_AGAIN);
}
} else {
Log.e(TAG, "onPointerDown(): mBiometricView is null");
} }
} }
@@ -715,7 +735,11 @@ public class AuthContainerView extends LinearLayout
@Override @Override
public void animateToCredentialUI() { public void animateToCredentialUI() {
mBiometricView.startTransitionToCredentialUI(); if (mBiometricView != null) {
mBiometricView.startTransitionToCredentialUI();
} else {
Log.e(TAG, "animateToCredentialUI(): mBiometricView is null");
}
} }
void animateAway(@AuthDialogCallback.DismissedReason int reason) { void animateAway(@AuthDialogCallback.DismissedReason int reason) {