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

Commit 6e6e5df7 authored by Brian Colonna's avatar Brian Colonna
Browse files

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

It appears that https://android-git.corp.google.com/g/#/c/144795/1
was incorrectly merged down into master.  This commit is to correctly
add the change from that cl into the master branch.

Without this change, if you bring up the emergency dialer while Face
Unlock is running, you momentarily see the backup lock.

Change-Id: I6350150bf46ac52d5c50c9e88119f09397d22902
parent 58915ce9

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) {