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 /media/libmedia/AudioSystem.cpp | |
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 'media/libmedia/AudioSystem.cpp')
-rw-r--r-- | media/libmedia/AudioSystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index e1b1776..e3b829b 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -170,10 +170,10 @@ status_t AudioSystem::setMode(int mode) } -status_t AudioSystem::isMusicActive(bool* state) { +status_t AudioSystem::isStreamActive(int stream, bool* state) { const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); if (af == 0) return PERMISSION_DENIED; - *state = af->isMusicActive(); + *state = af->isStreamActive(stream); return NO_ERROR; } |