summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-01-07 00:58:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-07 00:58:05 +0000
commit65b13a59775ac0b4b5d59d9cd78e0c9914790426 (patch)
tree180542cd152913dfbb5b34bfac319f2d6c675b2e /media/libmedia
parentcd39b480645df7b51679f118c2edc221cc620c19 (diff)
parentbb2e3e9d05e3760cfcf3cc63c10e7e8336e63a06 (diff)
downloadframeworks_av-65b13a59775ac0b4b5d59d9cd78e0c9914790426.zip
frameworks_av-65b13a59775ac0b4b5d59d9cd78e0c9914790426.tar.gz
frameworks_av-65b13a59775ac0b4b5d59d9cd78e0c9914790426.tar.bz2
am bb2e3e9d: am fb5d35c0: am 7ae3dfab: Merge "fix record from default input source" into lmp-mr1-dev
* commit 'bb2e3e9d05e3760cfcf3cc63c10e7e8336e63a06': fix record from default input source
Diffstat (limited to 'media/libmedia')
-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 8ad6c8b..07ca14f 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;