diff options
| author | Angus Kong <shkong@google.com> | 2013-04-19 17:25:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-19 17:25:58 +0000 |
| commit | 32cae72fda76329e181c20aa2f0b74e0f391fa8f (patch) | |
| tree | 5bd17b727261279dc05bb8a66921cd9b23bffb27 /src | |
| parent | 7e2796f51a96a57ca91b42ec2976f72c13f71d11 (diff) | |
| parent | 5327af1220eaf5b35cca6229466ccdc51970ee8b (diff) | |
| download | android_packages_apps_Snap-32cae72fda76329e181c20aa2f0b74e0f391fa8f.tar.gz android_packages_apps_Snap-32cae72fda76329e181c20aa2f0b74e0f391fa8f.tar.bz2 android_packages_apps_Snap-32cae72fda76329e181c20aa2f0b74e0f391fa8f.zip | |
Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index d4be225a0..7ebc0e841 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1490,6 +1490,7 @@ public class VideoModule implements CameraModule, return; } + if (!mActivity.mCameraDevice.waitDone()) return; mCurrentVideoUri = null; if (effectsActive()) { initializeEffectsRecording(); |