commit bad66071cceb0a64fbdbe7c1b142a183769ec0b9
author Clara Bayarri <clarabayarri@google.com> Thu Feb 18 15:52:49 2016 +0000
committer Clara Bayarri <clarabayarri@google.com> Tue Feb 23 15:52:53 2016 -0800
tree 33244eb5a17f2a3a327f4a876f43c3851d825c3a
parent e50ed4ac729407727e7078bc80e94379d5f9bcf8

Respect admin disallow fingerprint in ConfirmDeviceCredentials

Bug: 26891832
Change-Id: I4c6377fb79fa31e6059149220c854c47ad53eda7

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index ad1d2eb..090d4be 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -83,6 +83,7 @@
         // Only take this argument into account if it belongs to the current profile.
         Intent intent = getActivity().getIntent();
         mEffectiveUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
+        mAllowFpAuthentication = mAllowFpAuthentication && !isFingerprintDisabledByAdmin();
         mLockPatternUtils = new LockPatternUtils(getActivity());
     }
 
@@ -113,6 +114,13 @@
         }
     }
 
+    private boolean isFingerprintDisabledByAdmin() {
+        DevicePolicyManager dpm = (DevicePolicyManager) getActivity().getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
+        final int disabledFeatures = dpm.getKeyguardDisabledFeatures(null, mEffectiveUserId);
+        return (disabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;
+    }
+
     @Override
     public void onResume() {
         super.onResume();