From 67d47f6b4ad8b41372c63c2b3df246de8ee3835a Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Tue, 24 Jan 2023 23:55:29 +0000 Subject: [PATCH] Fix NullPointerException when renaming a fingerprint (Original change made by xingbin.feng@sony.com) Fix NullPointerException when rotating the screen while renaming a registered fingerprint Bug: 236873593 Test: Click a registered fingerprint to open the Rename dialog, rotate the device and press OK. Verify that Settings does not crash Change-Id: I1350c4bd121e0a7aaa291b3b8f96c80ef777150b --- .../biometrics/fingerprint/FingerprintSettings.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 44b3a406e6d..650a7f663d3 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -906,7 +906,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 @@ -944,7 +946,9 @@ public class FingerprintSettings extends SubSettings { parent.renameFingerPrint(mFp.getBiometricId(), newName); } - mDismissListener.onDismiss(dialog); + if (mDismissListener != null) { + mDismissListener.onDismiss(dialog); + } dialog.dismiss(); } })