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

Commit 21a99ddd authored by Ruben Brunk's avatar Ruben Brunk
Browse files

Disable face unlock when returning from camera. 

Bug: 11063890

- Workaround for bug 11063890.  Avoids the acquire/release
  race when resuming face unlock while pausing the camera
  widget.
Change-Id: I0a58f3a07f346da72ea55772242b4f9c54537235
parent 8f42b4e8

packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java

+5 −0
Original line number Diff line number Diff line
@@ -99,6 +99,11 @@ public abstract class KeyguardActivityLauncher { 


    public void launchCamera(Handler worker, Runnable onSecureCameraStarted) {

        LockPatternUtils lockPatternUtils = getLockPatternUtils();



        // Workaround to avoid camera release/acquisition race when resuming face unlock

        // after showing lockscreen camera (bug 11063890).

        KeyguardUpdateMonitor.getInstance(getContext()).setAlternateUnlockEnabled(false);



        if (lockPatternUtils.isSecure()) {

            // Launch the secure version of the camera

            if (wouldLaunchResolverActivity(SECURE_CAMERA_INTENT)) {