summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul McLean <pmclean@google.com>2015-04-28 18:26:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-28 18:26:11 +0000
commitc8240411c38b78ac8095f6e8067f7bcc7046f502 (patch)
treef7fe5c19a53d554a4a8e48eafb8ea76fcb79a891
parent5af4cc3922e8e1b6e1c89ee438c40c89980583ac (diff)
parent6bd27e1a0c030e0c47d21dd4c99c3133c85685a9 (diff)
downloadframeworks_base-c8240411c38b78ac8095f6e8067f7bcc7046f502.zip
frameworks_base-c8240411c38b78ac8095f6e8067f7bcc7046f502.tar.gz
frameworks_base-c8240411c38b78ac8095f6e8067f7bcc7046f502.tar.bz2
Merge "AudioRecord device select continued" into mnc-dev
-rw-r--r--core/jni/android_media_AudioRecord.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index d86f71a..c384ef9 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -587,9 +587,8 @@ static jint android_media_AudioRecord_get_min_buff_size(JNIEnv *env, jobject th
static jboolean android_media_AudioRecord_setInputDevice(
JNIEnv *env, jobject thiz, jint device_id) {
-// sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz);
-// return lpRecorder->setInputDevice(device_id) == NO_ERROR;
- return false;
+ sp<AudioRecord> lpRecorder = getAudioRecord(env, thiz);
+ return lpRecorder->setInputDevice(device_id) == NO_ERROR;
}
// ----------------------------------------------------------------------------