summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-07-30 16:35:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-30 16:35:09 +0000
commit97252bb0e40a5a9b41f020163393cf6c5da10b7e (patch)
tree2730f01323e31639eb85736a20ad0e0cf867876e /services/audioflinger/AudioFlinger.cpp
parentf20e1d8df84c5fbeeace0052d100982ae39bb7a4 (diff)
parent291bb6d8947c5b0c062f0895d623c529259bfa39 (diff)
downloadframeworks_av-97252bb0e40a5a9b41f020163393cf6c5da10b7e.zip
frameworks_av-97252bb0e40a5a9b41f020163393cf6c5da10b7e.tar.gz
frameworks_av-97252bb0e40a5a9b41f020163393cf6c5da10b7e.tar.bz2
Merge "AudioRecord and HAL input stream must be 16-bit PCM only"
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r--services/audioflinger/AudioFlinger.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index b30e2cf..d510641 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1227,6 +1227,12 @@ sp<IAudioRecord> AudioFlinger::openRecord(
goto Exit;
}
+ if (format != AUDIO_FORMAT_PCM_16_BIT) {
+ ALOGE("openRecord() invalid format %d", format);
+ lStatus = BAD_VALUE;
+ goto Exit;
+ }
+
// add client to list
{ // scope for mLock
Mutex::Autolock _l(mLock);