diff options
| author | Adrian Roos <roosa@google.com> | 2015-08-27 18:15:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 18:15:21 +0000 |
| commit | 6fe373b10ef2a2e56745ee2c67588e96f5b8dcad (patch) | |
| tree | 46a6c7bc85fd8fb4d9c2974bd222f534432af37f /packages/Keyguard | |
| parent | 60220b77b920b1547620281b911f0911df1ea249 (diff) | |
| parent | 16d7245b64062f4c65d55433642388d1dc9bdf70 (diff) | |
| download | frameworks_base-6fe373b10ef2a2e56745ee2c67588e96f5b8dcad.zip frameworks_base-6fe373b10ef2a2e56745ee2c67588e96f5b8dcad.tar.gz frameworks_base-6fe373b10ef2a2e56745ee2c67588e96f5b8dcad.tar.bz2 | |
am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
* commit '16d7245b64062f4c65d55433642388d1dc9bdf70':
Prevent Fingerprint when SIM is locked
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index ead0307..fc6117f 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -523,7 +523,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE); return dpm != null && (dpm.getKeyguardDisabledFeatures(null, userId) - & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0; + & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0 + || isSimPinSecure(); } public boolean getUserCanSkipBouncer(int userId) { @@ -1016,7 +1017,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { private boolean shouldListenForFingerprint() { return (mKeyguardIsVisible || !mDeviceInteractive) && !mSwitchingUser - && !mFingerprintAlreadyAuthenticated; + && !mFingerprintAlreadyAuthenticated && !isFingerprintDisabled(getCurrentUser()); } private void startListeningForFingerprint() { @@ -1090,6 +1091,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { * Handle {@link #MSG_DPM_STATE_CHANGED} */ protected void handleDevicePolicyManagerStateChanged() { + updateFingerprintListeningState(); for (int i = mCallbacks.size() - 1; i >= 0; i--) { KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); if (cb != null) { |