Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev

Browse Source 
* commit '9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43':
  Disable face unlock when returning from camera.
This commit is contained in:
Ruben Brunk
2013-11-06 15:30:26 -08:00
committed by Android Git Automerger
parent e5bdd85a99 9aed2ae0bd
commit df049d6f22
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Keyguard/src/com/android/keyguard/KeyguardActivityLauncher.java
View File

@@ -99,6 +99,11 @@ public abstract class KeyguardActivityLauncher {
public void launchCamera(Handler worker, Runnable onSecureCameraStarted) { public void launchCamera(Handler worker, Runnable onSecureCameraStarted) {
LockPatternUtils lockPatternUtils = getLockPatternUtils(); 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()) { if (lockPatternUtils.isSecure()) {
// Launch the secure version of the camera // Launch the secure version of the camera
if (wouldLaunchResolverActivity(SECURE_CAMERA_INTENT)) { if (wouldLaunchResolverActivity(SECURE_CAMERA_INTENT)) {