PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8a73e24c88fcbecc35ea77ef79a253790a77f949
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:58:33 +00:00
committed by Automerger Merge Worker
parent ce23f7b591 1d7192e9f6
commit 5ebb151415
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -1030,8 +1030,10 @@ public class FingerprintSettings extends SubSettings {
@Override @Override
public void onCancel(DialogInterface dialog) { public void onCancel(DialogInterface dialog) {
super.onCancel(dialog); super.onCancel(dialog);
if (mDismissListener != null) {
mDismissListener.onDismiss(dialog); mDismissListener.onDismiss(dialog);
} }
}
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -1068,7 +1070,9 @@ public class FingerprintSettings extends SubSettings {
parent.renameFingerPrint(mFp.getBiometricId(), parent.renameFingerPrint(mFp.getBiometricId(),
newName); newName);
} }
if (mDismissListener != null) {
mDismissListener.onDismiss(dialog); mDismissListener.onDismiss(dialog);
}
dialog.dismiss(); dialog.dismiss();
} }
}) })