diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-10-10 16:30:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 16:30:56 -0700 |
| commit | bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4 (patch) | |
| tree | 105532e4538a4d0839777896ee1a6d520b50d45a /core | |
| parent | fb9010798d9352fd4f9413f882ffd214d69610b5 (diff) | |
| parent | d677054ca63f55abaa1c478ea3c50f6be665a979 (diff) | |
| download | frameworks_base-bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4.zip frameworks_base-bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4.tar.gz frameworks_base-bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4.tar.bz2 | |
Merge "Don't play notifications during speech recognition" into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 56db116..631cdae 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -75,6 +75,14 @@ android_media_AudioSystem_isStreamActive(JNIEnv *env, jobject thiz, jint stream, return state; } +static jboolean +android_media_AudioSystem_isSourceActive(JNIEnv *env, jobject thiz, jint source) +{ + bool state = false; + AudioSystem::isSourceActive((audio_source_t) source, &state); + return state; +} + static int android_media_AudioSystem_setParameters(JNIEnv *env, jobject thiz, jstring keyValuePairs) { @@ -261,7 +269,8 @@ static JNINativeMethod gMethods[] = { {"getParameters", "(Ljava/lang/String;)Ljava/lang/String;", (void *)android_media_AudioSystem_getParameters}, {"muteMicrophone", "(Z)I", (void *)android_media_AudioSystem_muteMicrophone}, {"isMicrophoneMuted", "()Z", (void *)android_media_AudioSystem_isMicrophoneMuted}, - {"isStreamActive", "(II)Z", (void *)android_media_AudioSystem_isStreamActive}, + {"isStreamActive", "(II)Z", (void *)android_media_AudioSystem_isStreamActive}, + {"isSourceActive", "(I)Z", (void *)android_media_AudioSystem_isSourceActive}, {"setDeviceConnectionState", "(IILjava/lang/String;)I", (void *)android_media_AudioSystem_setDeviceConnectionState}, {"getDeviceConnectionState", "(ILjava/lang/String;)I", (void *)android_media_AudioSystem_getDeviceConnectionState}, {"setPhoneState", "(I)I", (void *)android_media_AudioSystem_setPhoneState}, |