diff options
| author | Doris Liu <tianliu@google.com> | 2014-04-25 17:35:27 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2014-06-18 10:24:45 -0700 |
| commit | d3865a20b022f6d54fe7ac052768a7ff0710017f (patch) | |
| tree | 5a6a512121b70033e224b40a02c92b73cc6f8ed1 /camera2/portability/src/com/android/ex/camera2 | |
| parent | bdaaaf5f0257168590fa8965e4d59b054636e6df (diff) | |
| download | android_frameworks_ex-d3865a20b022f6d54fe7ac052768a7ff0710017f.tar.gz android_frameworks_ex-d3865a20b022f6d54fe7ac052768a7ff0710017f.tar.bz2 android_frameworks_ex-d3865a20b022f6d54fe7ac052768a7ff0710017f.zip | |
Bring back video snapshot
Bug: 14220490
Change-Id: Ibf20d169aae9de4eb9c1e2151d9c7335bcf7b3a3
Diffstat (limited to 'camera2/portability/src/com/android/ex/camera2')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java index fbd757c..9498094 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java @@ -967,7 +967,7 @@ class AndroidCameraManagerImpl implements CameraManager { mDispatchThread.runJob(new Runnable() { @Override public void run() { - mCameraState.waitForStates(CAMERA_IDLE); + mCameraState.waitForStates(CAMERA_IDLE | CAMERA_UNLOCKED); mCameraHandler.requestTakePicture(ShutterCallbackForward .getNewInstance(handler, AndroidCameraProxyImpl.this, shutter), PictureCallbackForward |