From 23f25cda0c73f8eb878844dea32fb0bd419edca2 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Mon, 25 Jan 2010 08:49:09 -0800 Subject: 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. --- media/libmedia/AudioSystem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/libmedia/AudioSystem.cpp') diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index e1b17762a7cf..e3b829be3d61 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& af = AudioSystem::get_audio_flinger(); if (af == 0) return PERMISSION_DENIED; - *state = af->isMusicActive(); + *state = af->isStreamActive(stream); return NO_ERROR; } -- cgit v1.2.3-59-g8ed1b