drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bug 6605167: Turning off FUL during error counts as attempt" into jb-dev

Browse Source
This commit is contained in:
Brian Colonna
2012-06-08 14:45:11 -07:00
committed by Android (Google) Code Review
parent 4206ee2b68 7019325e18
commit 5ebf04cce4
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
policy/src/com/android/internal/policy/impl/FaceUnlock.java
View File

@ -375,8 +375,7 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback {
} }
/** /**
* Stops the Face Unlock service and exposes the backup lock. Called when the user presses the * Stops the Face Unlock service and exposes the backup lock.
* cancel button to skip Face Unlock, no face is detected or there is an error.
*/ */
void handleCancel() { void handleCancel() {
if (DEBUG) Log.d(TAG, "handleCancel()"); if (DEBUG) Log.d(TAG, "handleCancel()");
@ -390,19 +389,11 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback {
} }
/** /**
* Stops the Face Unlock service and exposes the backup lock, reporting a failed unlock attempt. * Increments the number of failed Face Unlock attempts.
* Called when Face Unlock denies access to the user.
*/ */
void handleReportFailedAttempt() { void handleReportFailedAttempt() {
if (DEBUG) Log.d(TAG, "handleReportFailedAttempt()"); if (DEBUG) Log.d(TAG, "handleReportFailedAttempt()");
mUpdateMonitor.reportFailedBiometricUnlockAttempt(); mUpdateMonitor.reportFailedBiometricUnlockAttempt();
if (mFaceUnlockView != null) {
mFaceUnlockView.setVisibility(View.INVISIBLE);
} else {
Log.e(TAG, "mFaceUnlockView is null in handleReportFailedAttempt()");
}
stop();
mKeyguardScreenCallback.pokeWakelock(BACKUP_LOCK_TIMEOUT);
} }
/** /**
@ -521,8 +512,7 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback {
} }
/** /**
* Called when the user presses cancel to skip Face Unlock, a face cannot be found or * Called when Face Unlock wants to go to the backup.
* there is an error.
*/ */
@Override @Override
public void cancel() { public void cancel() {
@ -531,7 +521,7 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback {
} }
/** /**
* Called when Face Unlock denies access to the user. * Called when Face Unlock wants to increment the number of failed attempts.
*/ */
@Override @Override
public void reportFailedAttempt() { public void reportFailedAttempt() {