Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95
am: 1d7192e9f6
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:
@@ -1030,8 +1030,10 @@ public class FingerprintSettings extends SubSettings {
|
||||
@Override
|
||||
public void onCancel(DialogInterface dialog) {
|
||||
super.onCancel(dialog);
|
||||
if (mDismissListener != null) {
|
||||
mDismissListener.onDismiss(dialog);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
@@ -1068,7 +1070,9 @@ public class FingerprintSettings extends SubSettings {
|
||||
parent.renameFingerPrint(mFp.getBiometricId(),
|
||||
newName);
|
||||
}
|
||||
if (mDismissListener != null) {
|
||||
mDismissListener.onDismiss(dialog);
|
||||
}
|
||||
dialog.dismiss();
|
||||
}
|
||||
})
|
||||
|
Reference in New Issue
Block a user