diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-11-05 18:29:06 -0800 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2013-11-06 10:21:43 -0800 |
| commit | 21a99ddd9cfd24c205f3483a56d4af5c83cbc6c4 (patch) | |
| tree | b4679d0b360243d8a05fba0ba48f7ce8a2a15d80 /packages/Keyguard/src/com/android | |
| parent | 8f42b4e8e475f498b3cbbe8d456902876850b1f5 (diff) | |
| download | frameworks_base-21a99ddd9cfd24c205f3483a56d4af5c83cbc6c4.zip frameworks_base-21a99ddd9cfd24c205f3483a56d4af5c83cbc6c4.tar.gz frameworks_base-21a99ddd9cfd24c205f3483a56d4af5c83cbc6c4.tar.bz2 | |
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
Diffstat (limited to 'packages/Keyguard/src/com/android')
| -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 9a1aa5b..0a915ea 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)) { |