Merge "DO NOT MERGE Fix of crash when error messages are triggered"
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
index fa92951..00c14ca 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintErrorDialog.java
@@ -34,7 +34,7 @@
final CharSequence errMsg = host.getText(getErrorMessage(errMsgId));
final FingerprintErrorDialog dialog = newInstance(errMsg, errMsgId);
final FragmentManager fragmentManager = host.getSupportFragmentManager();
- if (!fragmentManager.isDestroyed()) {
+ if (!fragmentManager.isDestroyed() && !fragmentManager.isStateSaved()) {
dialog.show(fragmentManager, FingerprintErrorDialog.class.getName());
}
}