Merge "Fix Settings crash" into sc-dev am: 8bc9c9e6ef

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

Change-Id: I032eacd1bb5b1b67a23be94a04492c832384ed73
This commit is contained in:
TreeHugger Robot
2021-04-06 09:17:15 +00:00
committed by Automerger Merge Worker

View File

@@ -20,6 +20,8 @@ import android.app.settings.SettingsEnums;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricErrorDialog;
@@ -31,7 +33,10 @@ public class FingerprintErrorDialog extends BiometricErrorDialog {
public static void showErrorDialog(BiometricEnrollBase host, int errMsgId) {
final CharSequence errMsg = host.getText(getErrorMessage(errMsgId));
final FingerprintErrorDialog dialog = newInstance(errMsg, errMsgId);
dialog.show(host.getSupportFragmentManager(), FingerprintErrorDialog.class.getName());
final FragmentManager fragmentManager = host.getSupportFragmentManager();
if (!fragmentManager.isDestroyed()) {
dialog.show(fragmentManager, FingerprintErrorDialog.class.getName());
}
}
private static int getErrorMessage(int errMsgId) {