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
This commit is contained in:
Ruben Brunk
2013-11-05 18:29:06 -08:00
parent 8f42b4e8e4
commit 21a99ddd9c

View File

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