diff options
| author | 2013-11-06 15:30:26 -0800 | |
|---|---|---|
| committer | 2013-11-06 15:30:26 -0800 | |
| commit | df049d6f2270b06679d51021c97eb9559f2657b7 (patch) | |
| tree | 60a1a9e82d59602a039671744b98d90af3e5b960 | |
| parent | e5bdd85a99839e1d557c924d5396d510151da42e (diff) | |
| parent | 9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43 (diff) | |
am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
* commit '9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43':
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)) { |