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 am: b8713e8713

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

Change-Id: I01ad24865fe3187b58edd496396a11dbb8da20df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ilya Matyukhin
2022-08-31 23:36:14 +00:00
committed by Automerger Merge Worker
parent c2ab75704c b8713e8713
commit ae685a115d
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
public void onAuthenticationSucceeded(@Modality int modality) {
mBiometricView.onAuthenticationSucceeded(modality);
if (mBiometricView != null) {
mBiometricView.onAuthenticationSucceeded(modality);
} else {
Log.e(TAG, "onAuthenticationSucceeded(): mBiometricView is null");
}
}
@Override
public void onAuthenticationFailed(@Modality int modality, String failureReason) {
mFailedModalities.add(modality);
mBiometricView.onAuthenticationFailed(modality, failureReason);
if (mBiometricView != null) {
mFailedModalities.add(modality);
mBiometricView.onAuthenticationFailed(modality, failureReason);
} else {
Log.e(TAG, "onAuthenticationFailed(): mBiometricView is null");
}
}
@Override
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
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
public void onPointerDown() {
if (mBiometricView.onPointerDown(mFailedModalities)) {
Log.d(TAG, "retrying failed modalities (pointer down)");
mBiometricCallback.onAction(AuthBiometricView.Callback.ACTION_BUTTON_TRY_AGAIN);
if (mBiometricView != null) {
if (mBiometricView.onPointerDown(mFailedModalities)) {
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
public void animateToCredentialUI() {
mBiometricView.startTransitionToCredentialUI();
if (mBiometricView != null) {
mBiometricView.startTransitionToCredentialUI();
} else {
Log.e(TAG, "animateToCredentialUI(): mBiometricView is null");
}
}
void animateAway(@AuthDialogCallback.DismissedReason int reason) {