diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-17 23:30:35 +0000 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-08-17 23:33:39 +0000 |
| commit | deb050706c5964800461333881b48ebb7329c536 (patch) | |
| tree | b8111a2304b9e3dd8fe9fe53d39ee94efae6159e /packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | |
| parent | 8ae1be120806d0189f65a492004a7b5416aa6c6f (diff) | |
| download | frameworks_base-deb050706c5964800461333881b48ebb7329c536.zip frameworks_base-deb050706c5964800461333881b48ebb7329c536.tar.gz frameworks_base-deb050706c5964800461333881b48ebb7329c536.tar.bz2 | |
Revert "Disable fingerprint when remotely reset by DPM"
This reverts commit 8ae1be120806d0189f65a492004a7b5416aa6c6f.
Fixes bug 23187090
Change-Id: Idd9798895b08618f7d272b818818a45d3c9dc7d2
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 113b1f4..c7adc98 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -548,7 +548,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { - @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); if (DEBUG) Log.d(TAG, "received broadcast " + action); @@ -600,7 +599,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { private final BroadcastReceiver mBroadcastAllReceiver = new BroadcastReceiver() { - @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); if (AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED.equals(action)) { @@ -715,7 +713,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { return new SimData(state, slotId, subId); } - @Override public String toString() { return "SimData{state=" + simState + ",slotId=" + slotId + ",subId=" + subId + "}"; } @@ -898,9 +895,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } private boolean shouldListenForFingerprint() { - return mKeyguardIsVisible && !mSwitchingUser && - mTrustManager.hasUserAuthenticatedSinceBoot( - ActivityManager.getCurrentUser()); + return mKeyguardIsVisible && !mSwitchingUser; } private void startListeningForFingerprint() { |