From c9f58d684eb0536b433c109e11fcbba31d3d61eb Mon Sep 17 00:00:00 2001
From: lbill <lbill@google.com>
Date: Tue, 15 Nov 2022 12:46:30 +0000
Subject: [PATCH] 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
---
 .../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 2cbef992ead..ada7ba4b121 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -1014,7 +1014,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
@@ -1052,7 +1054,9 @@ public class FingerprintSettings extends SubSettings {
                                             parent.renameFingerPrint(mFp.getBiometricId(),
                                                     newName);
                                         }
-                                        mDismissListener.onDismiss(dialog);
+                                        if (mDismissListener != null) {
+                                            mDismissListener.onDismiss(dialog);
+                                        }
                                         dialog.dismiss();
                                     }
                                 })