Skip to content

Commit 46f335a

Browse files
Brian ColonnaThe Android Automerger
authored andcommitted
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 6c65e8b commit 46f335a

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
@@ -334,7 +334,10 @@ public void takeEmergencyCallAction() {
334334
stopAndUnbindFromFaceLock();
335335

336336
// Continue showing FaceLock area until dialer comes up
337-
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT);
337+
if (mLockPatternUtils.usingBiometricWeak() &&
338+
mLockPatternUtils.isBiometricWeakInstalled()) {
339+
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT);
340+
}
338341

339342
pokeWakelock(EMERGENCY_CALL_TIMEOUT);
340343
if (TelephonyManager.getDefault().getCallState()
@@ -535,7 +538,10 @@ private void activateFaceLockIfAble() {
535538
bindToFaceLock();
536539
// Show FaceLock area, but only for a little bit so lockpattern will become visible if
537540
// FaceLock fails to start or crashes
538-
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_SERVICE_TIMEOUT);
541+
if (mLockPatternUtils.usingBiometricWeak() &&
542+
mLockPatternUtils.isBiometricWeakInstalled()) {
543+
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_SERVICE_TIMEOUT);
544+
}
539545
} else {
540546
hideFaceLockArea();
541547
}

0 commit comments

Comments
 (0)