diff options
| author | 2013-11-06 15:26:48 -0800 | |
|---|---|---|
| committer | 2013-11-06 15:26:48 -0800 | |
| commit | 9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43 (patch) | |
| tree | 9aea9c26eeb9278e2ffd1de9260c33a336b540cf | |
| parent | ea18624ae557a06e49748964f951a81fd6c48370 (diff) | |
| parent | e77d2a9c62e747902bc53d40e303214705702b00 (diff) | |
am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
* commit 'e77d2a9c62e747902bc53d40e303214705702b00':
Disable face unlock when returning from camera.
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java | 5 |
1 files changed, 5 insertions, 0 deletions
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)) { |