diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-06 01:57:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 01:57:54 +0000 |
| commit | 5f96eb0caf6db51751b2af6404c98037067ce29d (patch) | |
| tree | 714f635bb866f06d9516060e02977956bd8ab268 /packages/Keyguard | |
| parent | 7be1e2864136e87ad473f35e54a6795c4a58df8d (diff) | |
| parent | 6fdb85d383007e7d68895195d6347840276abeab (diff) | |
| download | frameworks_base-5f96eb0caf6db51751b2af6404c98037067ce29d.zip frameworks_base-5f96eb0caf6db51751b2af6404c98037067ce29d.tar.gz frameworks_base-5f96eb0caf6db51751b2af6404c98037067ce29d.tar.bz2 | |
am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '6fdb85d383007e7d68895195d6347840276abeab':
Disable fingerprint when remotely reset by DPM
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 5183c35..55d8520 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -557,6 +557,7 @@ 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); @@ -610,6 +611,7 @@ 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)) { @@ -724,6 +726,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { return new SimData(state, slotId, subId); } + @Override public String toString() { return "SimData{state=" + simState + ",slotId=" + slotId + ",subId=" + subId + "}"; } @@ -939,7 +942,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } private boolean shouldListenForFingerprint() { - return mKeyguardIsVisible && !mSwitchingUser; + return mKeyguardIsVisible && !mSwitchingUser && + mTrustManager.hasUserAuthenticatedSinceBoot( + ActivityManager.getCurrentUser()); } private void startListeningForFingerprint() { |