summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-11-09 11:04:56 +0800
committerWu-cheng Li <wuchengli@google.com>2010-11-09 11:04:56 +0800
commit6897561d02003e59c038f1dc4d4669e3723e9cad (patch)
tree024bc4535afaa92d096c2bcf6f88bb657314ba30
parentf59f7fb9870c1f285f9bdb5e3ca47a1548527837 (diff)
parent86b149d93eaf2dc9004653de40a178891022260f (diff)
downloadLegacyCamera-6897561d02003e59c038f1dc4d4669e3723e9cad.zip
LegacyCamera-6897561d02003e59c038f1dc4d4669e3723e9cad.tar.gz
LegacyCamera-6897561d02003e59c038f1dc4d4669e3723e9cad.tar.bz2
resolved conflicts for merge of 86b149d9 to master
Change-Id: Ida51ce14cbee3071cc26448e39bec05d505c8947
-rw-r--r--src/com/android/camera/VideoCamera.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 15bdf91..e2732e3 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1025,7 +1025,7 @@ public class VideoCamera extends NoSearchActivity
mMediaRecorder.setCamera(mCameraDevice);
if (!mCaptureTimeLapse) {
- mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+ mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
}
mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
mMediaRecorder.setProfile(mProfile);