commit e84fbbfd162edb5874eae9e432d634b13fb7bba6
author Eino-Ville Talvala <etalvala@google.com> Fri Sep 07 10:55:30 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 07 10:55:31 2012 -0700
tree 56446bc990d13dc739b0db17d480a2bc5ea7c18e
parent 741b47db87db45dad47d115ffcc67553184ffbe3
parent 33578836f930024306fb2a173d7da36d7f3d7dbf

Merge "Camera2: Play shutter and recording sounds." into jb-mr1-dev

media/libmedia/AudioRecord.cpp

diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 5060525..8ea6306 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -177,7 +177,7 @@
 
     // validate framecount
     int minFrameCount = 0;
-    status_t status = getMinFrameCount(&minFrameCount, sampleRate, format, channelCount);
+    status_t status = getMinFrameCount(&minFrameCount, sampleRate, format, channelMask);
     if (status != NO_ERROR) {
         return status;
     }