commit c9f58d684eb0536b433c109e11fcbba31d3d61eb
author lbill <lbill@google.com> Tue Nov 15 12:46:30 2022 +0000
committer lbill <lbill@google.com> Tue Nov 15 19:06:00 2022 +0000
tree f1076d897f41267febb0c58be68fe9e9c78a27c4
parent 0a2c5d069adc48dfebb39043881219231115a80c

Fix NPE of mDismissListener in Rename Dialog

Bug: 241122882
Test: Enroll 1 fingerprint, and rename in landscape mode, check no
more NPE when focus on inputfield and IME shown

Change-Id: I24fe9aab11cabd67015989cfaaf6a8228ea72b59

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 2cbef99..ada7ba4 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -1014,7 +1014,9 @@
             @Override
             public void onCancel(DialogInterface dialog) {
                 super.onCancel(dialog);
-                mDismissListener.onDismiss(dialog);
+                if (mDismissListener != null) {
+                    mDismissListener.onDismiss(dialog);
+                }
             }
 
             @Override
@@ -1052,7 +1054,9 @@
                                             parent.renameFingerPrint(mFp.getBiometricId(),
                                                     newName);
                                         }
-                                        mDismissListener.onDismiss(dialog);
+                                        if (mDismissListener != null) {
+                                            mDismissListener.onDismiss(dialog);
+                                        }
                                         dialog.dismiss();
                                     }
                                 })