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

Merge "Disallow fingerprint based on user unlock state."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-15 14:11:34 +00:00
committed by Android (Google) Code Review
parent 517ac9791e 783870c205
commit 14ad1f0247
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
protected ImageView mFingerprintIcon; protected ImageView mFingerprintIcon;
protected int mEffectiveUserId; protected int mEffectiveUserId;
protected int mUserId; protected int mUserId;
protected UserManager mUserManager;
protected LockPatternUtils mLockPatternUtils; protected LockPatternUtils mLockPatternUtils;
protected TextView mErrorTextView; protected TextView mErrorTextView;
protected final Handler mHandler = new Handler(); protected final Handler mHandler = new Handler();
@@ -90,8 +91,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
// Only take this argument into account if it belongs to the current profile. // Only take this argument into account if it belongs to the current profile.
Intent intent = getActivity().getIntent(); Intent intent = getActivity().getIntent();
mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras()); mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
final UserManager userManager = UserManager.get(getActivity()); mUserManager = UserManager.get(getActivity());
mEffectiveUserId = userManager.getCredentialOwnerProfile(mUserId); mEffectiveUserId = mUserManager.getCredentialOwnerProfile(mUserId);
mLockPatternUtils = new LockPatternUtils(getActivity()); mLockPatternUtils = new LockPatternUtils(getActivity());
} }
@@ -117,7 +118,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
Utils.getUserIdFromBundle( Utils.getUserIdFromBundle(
getActivity(), getActivity(),
getActivity().getIntent().getExtras())); getActivity().getIntent().getExtras()));
if (UserManager.get(getActivity()).isManagedProfile(credentialOwnerUserId)) { if (mUserManager.isManagedProfile(credentialOwnerUserId)) {
setWorkChallengeBackground(view, credentialOwnerUserId); setWorkChallengeBackground(view, credentialOwnerUserId);
} }
} }
@@ -135,7 +136,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
// fingerprint is disabled due to device restart. // fingerprint is disabled due to device restart.
private boolean isFingerprintDisallowedByStrongAuth() { private boolean isFingerprintDisallowedByStrongAuth() {
return !(mLockPatternUtils.isFingerprintAllowedForUser(mEffectiveUserId) return !(mLockPatternUtils.isFingerprintAllowedForUser(mEffectiveUserId)
&& KeyStore.getInstance().state(mUserId) == KeyStore.State.UNLOCKED); && mUserManager.isUserUnlocked(mUserId));
} }
@Override @Override
@@ -262,7 +263,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
} }
protected boolean isProfileChallenge() { protected boolean isProfileChallenge() {
return UserManager.get(getContext()).isManagedProfile(mEffectiveUserId); return mUserManager.isManagedProfile(mEffectiveUserId);
} }
protected void reportSuccessfullAttempt() { protected void reportSuccessfullAttempt() {