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

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

Merge "Making Face Unlock fix that wasn't proerly merged in master"

parents 4a3d5b04 6e6e5df7

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

+3 −2
Original line number Diff line number Diff line
@@ -366,14 +366,15 @@ 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 or call is resumed

                if (usingFaceLock() && mFaceLockServiceRunning) {

                    showFaceLockAreaWithTimeout(FACELOCK_VIEW_AREA_EMERGENCY_DIALER_TIMEOUT);

                }



                // FaceLock must be stopped if it is running when emergency call is pressed

                stopAndUnbindFromFaceLock();



                pokeWakelock(EMERGENCY_CALL_TIMEOUT);

                if (TelephonyManager.getDefault().getCallState()

                        == TelephonyManager.CALL_STATE_OFFHOOK) {