Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 842f0f45 authored by Brian Colonna's avatar Brian Colonna Committed by Android (Google) Code Review
Browse files

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

parents 763480fb 1a088aa1

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

+5 −4
Original line number Diff line number Diff line
@@ -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) {