Skip to content

Commit 2ce6882

Browse files
author
Brian Colonna
committed
Fixed problem where Face Unlock area was showing
I introduced a bug cl https://android-git.corp.google.com/g/#/c/141926 that caused black box to hide lock pattern even when not using Face Unlock. Fixed by adding the corresponding check to make sure Face Unlock is being used. Change-Id: I9c429c99d7db4d1ab831080f23a1e10123dbfe3e
1 parent 3505abf commit 2ce6882

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,10 @@ public void takeEmergencyCallAction() {
337337
stopAndUnbindFromFaceLock();
338338

339339
// Continue showing FaceLock area until dialer comes up
340-
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT);
340+
if (mLockPatternUtils.usingBiometricWeak() &&
341+
mLockPatternUtils.isBiometricWeakInstalled()) {
342+
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT);
343+
}
341344

342345
pokeWakelock(EMERGENCY_CALL_TIMEOUT);
343346
if (TelephonyManager.getDefault().getCallState()
@@ -538,7 +541,10 @@ private void activateFaceLockIfAble() {
538541
bindToFaceLock();
539542
// Show FaceLock area, but only for a little bit so lockpattern will become visible if
540543
// FaceLock fails to start or crashes
541-
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_SERVICE_TIMEOUT);
544+
if (mLockPatternUtils.usingBiometricWeak() &&
545+
mLockPatternUtils.isBiometricWeakInstalled()) {
546+
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_SERVICE_TIMEOUT);
547+
}
542548
} else {
543549
hideFaceLockArea();
544550
}

0 commit comments

Comments
 (0)