diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java index 40972aca7cb..a5aa5b4e901 100644 --- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java @@ -76,6 +76,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra protected ImageView mFingerprintIcon; protected int mEffectiveUserId; protected int mUserId; + protected UserManager mUserManager; protected LockPatternUtils mLockPatternUtils; protected TextView mErrorTextView; 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. Intent intent = getActivity().getIntent(); mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras()); - final UserManager userManager = UserManager.get(getActivity()); - mEffectiveUserId = userManager.getCredentialOwnerProfile(mUserId); + mUserManager = UserManager.get(getActivity()); + mEffectiveUserId = mUserManager.getCredentialOwnerProfile(mUserId); mLockPatternUtils = new LockPatternUtils(getActivity()); } @@ -117,7 +118,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra Utils.getUserIdFromBundle( getActivity(), getActivity().getIntent().getExtras())); - if (UserManager.get(getActivity()).isManagedProfile(credentialOwnerUserId)) { + if (mUserManager.isManagedProfile(credentialOwnerUserId)) { setWorkChallengeBackground(view, credentialOwnerUserId); } } @@ -135,7 +136,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra // fingerprint is disabled due to device restart. private boolean isFingerprintDisallowedByStrongAuth() { return !(mLockPatternUtils.isFingerprintAllowedForUser(mEffectiveUserId) - && KeyStore.getInstance().state(mUserId) == KeyStore.State.UNLOCKED); + && mUserManager.isUserUnlocked(mUserId)); } @Override @@ -262,7 +263,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra } protected boolean isProfileChallenge() { - return UserManager.get(getContext()).isManagedProfile(mEffectiveUserId); + return mUserManager.isManagedProfile(mEffectiveUserId); } protected void reportSuccessfullAttempt() {