commit 4468048125f638f53e6292c42702449e5c2102bc
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 01 18:22:06 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 01 18:22:06 2021 +0000
tree dc930fb403fc04b99bfc027d718479e8c091ccf6
parent 2bc4a74954764ead047db30d77b31788e5fb9e23
parent 041d8cdb5ae7133e983480af0f25bde3e4ef5af3

Merge "Fix crash when error messages are triggered due to configuration changes." into sc-v2-dev am: 041d8cdb5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697677

Change-Id: Iea9d977556a7963a43f6d5e6b6cdeb071223e012

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

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
index fa92951..0fc8670 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
@@ -31,12 +31,18 @@
  */
 public class FingerprintErrorDialog extends BiometricErrorDialog {
     public static void showErrorDialog(BiometricEnrollBase host, int errMsgId) {
+        if (host.isFinishing()) {
+            return;
+        }
+
+        final FragmentManager fragmentManager = host.getSupportFragmentManager();
+        if (fragmentManager.isDestroyed()) {
+            return;
+        }
+
         final CharSequence errMsg = host.getText(getErrorMessage(errMsgId));
         final FingerprintErrorDialog dialog = newInstance(errMsg, errMsgId);
-        final FragmentManager fragmentManager = host.getSupportFragmentManager();
-        if (!fragmentManager.isDestroyed()) {
-            dialog.show(fragmentManager, FingerprintErrorDialog.class.getName());
-        }
+        dialog.show(fragmentManager, FingerprintErrorDialog.class.getName());
     }
 
     private static int getErrorMessage(int errMsgId) {