commit a4b2bc9b2be7c5c2922b63fe5702f968a478b539
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 16 03:26:40 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 16 03:26:40 2022 +0000
tree d744badab95e7bc53f6d7a22115b570dd660f050
parent daf43a4605a9f893618a7dc66fa6984d9a14b947
parent c9f58d684eb0536b433c109e11fcbba31d3d61eb

Merge "Fix NPE of mDismissListener in Rename Dialog"

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 34c20db..dddef4e 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -1020,7 +1020,9 @@
             @Override
             public void onCancel(DialogInterface dialog) {
                 super.onCancel(dialog);
-                mDismissListener.onDismiss(dialog);
+                if (mDismissListener != null) {
+                    mDismissListener.onDismiss(dialog);
+                }
             }
 
             @Override
@@ -1058,7 +1060,9 @@
                                             parent.renameFingerPrint(mFp.getBiometricId(),
                                                     newName);
                                         }
-                                        mDismissListener.onDismiss(dialog);
+                                        if (mDismissListener != null) {
+                                            mDismissListener.onDismiss(dialog);
+                                        }
                                         dialog.dismiss();
                                     }
                                 })