From 21a99ddd9cfd24c205f3483a56d4af5c83cbc6c4 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Tue, 5 Nov 2013 18:29:06 -0800 Subject: 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 --- .../Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java b/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java index 9a1aa5b79564..0a915eaf688e 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java @@ -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)) { -- cgit v1.2.3-59-g8ed1b