commit 35c32db8002468759ee91e7b74d1f45fdf7772fb
author Michal Karpinski <mkarpinski@google.com> Mon Jan 16 14:20:25 2017 +0000
committer Michal Karpinski <mkarpinski@google.com> Fri Jan 20 19:16:15 2017 +0000
tree 328c965fd9ec022cda2492174e91b76a1090d33c
parent 60c7f095d564fcd4d1cf7bdc014624b39874e582

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

Test: manual
Bug: 29825955
Change-Id: Id01a21fecf395ba29858e099947eeb83a4cee8fc

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index 5aa66bb..cabc805 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -90,9 +90,6 @@
         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 @@
     @Override
     public void onResume() {
         super.onResume();
+        mIsStrongAuthRequired = isFingerprintDisallowedByStrongAuth();
+        mAllowFpAuthentication = getActivity().getIntent().getBooleanExtra(
+                        ALLOW_FP_AUTHENTICATION, false)
+                && !isFingerprintDisabledByAdmin() && !mReturnCredentials && !mIsStrongAuthRequired;
         refreshLockScreen();
     }