diff options
| author | Adrian Roos <roosa@google.com> | 2015-08-27 18:06:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-27 18:06:44 +0000 |
| commit | 16d7245b64062f4c65d55433642388d1dc9bdf70 (patch) | |
| tree | 5117e3b0fe88ab96a0c5ac079cf96d61d428cf1c /packages/Keyguard | |
| parent | fd538001f5c7f1fad68a27d8143c839bda82491b (diff) | |
| parent | 733b663cc22648d38abf70bfbf8ae0eb43ff396e (diff) | |
| download | frameworks_base-16d7245b64062f4c65d55433642388d1dc9bdf70.zip frameworks_base-16d7245b64062f4c65d55433642388d1dc9bdf70.tar.gz frameworks_base-16d7245b64062f4c65d55433642388d1dc9bdf70.tar.bz2 | |
Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
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) { |