Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4b2bc9b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE of mDismissListener in Rename Dialog"

parents daf43a46 c9f58d68

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

+6 −2
Original line number Diff line number Diff line
@@ -1020,8 +1020,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) {
@@ -1058,7 +1060,9 @@ public class FingerprintSettings extends SubSettings { 
                                            parent.renameFingerPrint(mFp.getBiometricId(),

                                                    newName);

                                        }

                                        if (mDismissListener != null) {

                                            mDismissListener.onDismiss(dialog);

                                        }

                                        dialog.dismiss();

                                    }

                                })