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

Merge "Fix 5479823: black patch was showing before resuming call" into ics-mr0

Browse Source
This commit is contained in:
Brian Colonna
2011-10-25 05:43:37 -07:00
committed by Android (Google) Code Review
parent 763480fbca 1a088aa1b9
commit 842f0f4539
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
View File

@@ -358,15 +358,16 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
public void takeEmergencyCallAction() {
mHasOverlay = true;
// FaceLock must be stopped if it is running when emergency call is pressed
stopAndUnbindFromFaceLock();
// Continue showing FaceLock area until dialer comes up
// Continue showing FaceLock area until dialer comes up or call is resumed
if (mLockPatternUtils.usingBiometricWeak() &&
mLockPatternUtils.isBiometricWeakInstalled()) {
mLockPatternUtils.isBiometricWeakInstalled() && mFaceLockServiceRunning) {
showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT);
}
// FaceLock must be stopped if it is running
stopAndUnbindFromFaceLock();
pokeWakelock(EMERGENCY_CALL_TIMEOUT);
if (TelephonyManager.getDefault().getCallState()
== TelephonyManager.CALL_STATE_OFFHOOK) {