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

Commit e77d2a9c authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "Disable face unlock when returning from camera." into klp-dev

parents c9d0ee5e 21a99ddd

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