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

Fix bug 7338736. Only starting FUL if the screen is on

Browse Source 
Change-Id: Id767cf1394218a7e9dccabcdd9aae5af27b493b1
This commit is contained in:
Uriel Rodriguez
2012-10-12 15:00:48 -04:00
parent 732d88e14e
commit 94c7b14b1a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
policy/src/com/android/internal/policy/impl/keyguard/KeyguardFaceUnlockView.java
View File

@@ -16,6 +16,7 @@
package com.android.internal.policy.impl.keyguard;
import android.content.Context;
import android.os.PowerManager;
import android.telephony.TelephonyManager;
import android.util.AttributeSet;
import android.util.Log;
@@ -29,7 +30,7 @@ import com.android.internal.widget.LockPatternUtils;
public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecurityView {
private static final String TAG = "KeyguardFaceUnlockView";
private static final String TAG = "FULKeyguardFaceUnlockView";
private static final boolean DEBUG = false;
private KeyguardSecurityCallback mKeyguardSecurityCallback;
private LockPatternUtils mLockPatternUtils;
@@ -139,11 +140,14 @@ public class KeyguardFaceUnlockView extends LinearLayout implements KeyguardSecu
final boolean backupIsTimedOut = (
monitor.getFailedUnlockAttempts() >=
LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT);
// TODO: These max attempts checks are also checked in KeyguardSecurityModel so they
// might not be necessary here anymore.
PowerManager powerManager = (PowerManager) mContext.getSystemService(
Context.POWER_SERVICE);
// TODO: Some of these conditions are handled in KeyguardSecurityModel and may not be
// necessary here.
if (monitor.getPhoneState() != TelephonyManager.CALL_STATE_RINGING
&& !monitor.getMaxBiometricUnlockAttemptsReached()
&& !backupIsTimedOut) {
&& !backupIsTimedOut
&& powerManager.isScreenOn()) {
mBiometricUnlock.start();
} else {
mBiometricUnlock.stopAndShowBackup();