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

am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev

Browse Source 
* commit '54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481':
  Poke fingerprint timeout when vold password is correct
This commit is contained in:
Adrian Roos
2015-09-03 19:57:58 +00:00
committed by Android Git Automerger
parent 4eb81345da 54ceea195b
commit 95179ad4be
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1348,10 +1348,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
*/ */
private void handleKeyguardReset() { private void handleKeyguardReset() {
if (DEBUG) Log.d(TAG, "handleKeyguardReset"); if (DEBUG) Log.d(TAG, "handleKeyguardReset");
if (!isUnlockingWithFingerprintAllowed()) {
updateFingerprintListeningState(); updateFingerprintListeningState();
} }
}
/** /**
* Handle {@link #MSG_KEYGUARD_BOUNCER_CHANGED} * Handle {@link #MSG_KEYGUARD_BOUNCER_CHANGED}

1
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -1046,6 +1046,7 @@ public class KeyguardViewMediator extends SystemUI {
// Without this, settings is not enabled until the lock screen first appears // Without this, settings is not enabled until the lock screen first appears
setShowingLocked(false); setShowingLocked(false);
hideLocked(); hideLocked();
mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();
return; return;
} }