diff options
| author | Eric Laurent <elaurent@google.com> | 2010-01-25 08:49:09 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-01-25 14:00:10 -0800 |
| commit | 23f25cda0c73f8eb878844dea32fb0bd419edca2 (patch) | |
| tree | c1945d31c382864db8da0b829ccb017d2c31bbd6 /core/jni | |
| parent | bb04b631b60e0286c02e0fd4dd7ab764a001e0ce (diff) | |
| download | frameworks_base-23f25cda0c73f8eb878844dea32fb0bd419edca2.zip frameworks_base-23f25cda0c73f8eb878844dea32fb0bd419edca2.tar.gz frameworks_base-23f25cda0c73f8eb878844dea32fb0bd419edca2.tar.bz2 | |
Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active.
Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream
type is playing.
Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 3d8d296..3995026 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -64,10 +64,10 @@ android_media_AudioSystem_isMicrophoneMuted(JNIEnv *env, jobject thiz) } static jboolean -android_media_AudioSystem_isMusicActive(JNIEnv *env, jobject thiz) +android_media_AudioSystem_isStreamActive(JNIEnv *env, jobject thiz, jint stream) { bool state = false; - AudioSystem::isMusicActive(&state); + AudioSystem::isStreamActive(stream, &state); return state; } @@ -195,7 +195,7 @@ 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}, - {"isMusicActive", "()Z", (void *)android_media_AudioSystem_isMusicActive}, + {"isStreamActive", "(I)Z", (void *)android_media_AudioSystem_isStreamActive}, {"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}, |