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

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

Browse Source 
* commit '95179ad4be0377dd9fd35818145f705bcded0d28':
  Poke fingerprint timeout when vold password is correct
This commit is contained in:
Adrian Roos
2015-09-03 20:07:25 +00:00
committed by Android Git Automerger
parent 4008702700 95179ad4be
commit 123fb19dd1
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1348,9 +1348,7 @@ 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();
}
} }
/** /**

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;
} }