Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev

Browse Source
This commit is contained in:
Adrian Roos
2015-08-27 18:06:44 +00:00
committed by Android (Google) Code Review
parent fd538001f5 733b663cc2
commit 16d7245b64
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -523,7 +523,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
final DevicePolicyManager dpm = final DevicePolicyManager dpm =
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE); (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
return dpm != null && (dpm.getKeyguardDisabledFeatures(null, userId) return dpm != null && (dpm.getKeyguardDisabledFeatures(null, userId)
& DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0; & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0
|| isSimPinSecure();
} }
public boolean getUserCanSkipBouncer(int userId) { public boolean getUserCanSkipBouncer(int userId) {
@@ -1016,7 +1017,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
private boolean shouldListenForFingerprint() { private boolean shouldListenForFingerprint() {
return (mKeyguardIsVisible || !mDeviceInteractive) && !mSwitchingUser return (mKeyguardIsVisible || !mDeviceInteractive) && !mSwitchingUser
&& !mFingerprintAlreadyAuthenticated; && !mFingerprintAlreadyAuthenticated && !isFingerprintDisabled(getCurrentUser());
} }
private void startListeningForFingerprint() { private void startListeningForFingerprint() {
@@ -1090,6 +1091,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
* Handle {@link #MSG_DPM_STATE_CHANGED} * Handle {@link #MSG_DPM_STATE_CHANGED}
*/ */
protected void handleDevicePolicyManagerStateChanged() { protected void handleDevicePolicyManagerStateChanged() {
updateFingerprintListeningState();
for (int i = mCallbacks.size() - 1; i >= 0; i--) { for (int i = mCallbacks.size() - 1; i >= 0; i--) {
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
if (cb != null) { if (cb != null) {