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

Commit e44be9f7 authored by Michal Karpinski's avatar Michal Karpinski Committed by Android (Google) Code Review
Browse files

Merge "Check for whether fingerprint can be used in work challenge moved from... 

Merge "Check for whether fingerprint can be used in work challenge moved from onCreate() to onResume()"
parents 3c89f501 35c32db8

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

+4 −3
Original line number Diff line number Diff line
@@ -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();

    }