PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check for whether fingerprint can be used in work challenge moved from onCreate() to onResume()"

Browse Source
This commit is contained in:
Michal Karpinski
2017-01-20 22:02:34 +00:00
committed by Android (Google) Code Review
parent 3c89f50119 35c32db800
commit e44be9f729
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -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();
}