summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioRecord.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-01-07 00:11:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-07 00:11:15 +0000
commitfb5d35c00d1c4d672d245b6820551808617eba46 (patch)
treecb68266686a4fb4d6bc15eef8fa9247a6ccd5de4 /media/libmedia/AudioRecord.cpp
parent318dfaa0c5592bb87c4a35e404a3e5f3b93e99d0 (diff)
parent7ae3dfabb40d061aa613b255cba65ee35567f323 (diff)
downloadframeworks_av-fb5d35c00d1c4d672d245b6820551808617eba46.zip
frameworks_av-fb5d35c00d1c4d672d245b6820551808617eba46.tar.gz
frameworks_av-fb5d35c00d1c4d672d245b6820551808617eba46.tar.bz2
am 7ae3dfab: Merge "fix record from default input source" into lmp-mr1-dev
* commit '7ae3dfabb40d061aa613b255cba65ee35567f323': fix record from default input source
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
-rw-r--r--media/libmedia/AudioRecord.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index d9646d9..ca3832d 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -167,10 +167,6 @@ status_t AudioRecord::set(
return INVALID_OPERATION;
}
- // handle default values first.
- if (inputSource == AUDIO_SOURCE_DEFAULT) {
- inputSource = AUDIO_SOURCE_MIC;
- }
if (pAttributes == NULL) {
memset(&mAttributes, 0, sizeof(audio_attributes_t));
mAttributes.source = inputSource;