diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java index 5aa66bbb245..cabc8050acf 100644 --- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java @@ -90,9 +90,6 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra final UserManager userManager = UserManager.get(getActivity()); mEffectiveUserId = userManager.getCredentialOwnerProfile(mUserId); mLockPatternUtils = new LockPatternUtils(getActivity()); - mIsStrongAuthRequired = isFingerprintDisallowedByStrongAuth(); - mAllowFpAuthentication = mAllowFpAuthentication && !isFingerprintDisabledByAdmin() - && !mReturnCredentials && !mIsStrongAuthRequired; } @Override @@ -141,6 +138,10 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra @Override public void onResume() { super.onResume(); + mIsStrongAuthRequired = isFingerprintDisallowedByStrongAuth(); + mAllowFpAuthentication = getActivity().getIntent().getBooleanExtra( + ALLOW_FP_AUTHENTICATION, false) + && !isFingerprintDisabledByAdmin() && !mReturnCredentials && !mIsStrongAuthRequired; refreshLockScreen(); }