Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034

Change-Id: I4f2e99ebcb887b0203fcb7bb915968b4acd11f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-25 02:15:02 +00:00
committed by Automerger Merge Worker

View File

@@ -1020,7 +1020,9 @@ public class FingerprintSettings extends SubSettings {
@Override
public void onCancel(DialogInterface dialog) {
super.onCancel(dialog);
mDismissListener.onDismiss(dialog);
if (mDismissListener != null) {
mDismissListener.onDismiss(dialog);
}
}
@Override
@@ -1058,7 +1060,9 @@ public class FingerprintSettings extends SubSettings {
parent.renameFingerPrint(mFp.getBiometricId(),
newName);
}
mDismissListener.onDismiss(dialog);
if (mDismissListener != null) {
mDismissListener.onDismiss(dialog);
}
dialog.dismiss();
}
})