diff options
| author | android-build SharedAccount <android-build@undroid16.corp.google.com> | 2009-01-15 16:16:01 -0800 |
|---|---|---|
| committer | android-build SharedAccount <android-build@undroid16.corp.google.com> | 2009-01-15 16:16:01 -0800 |
| commit | 0fda766e53fba7e829fe6e145738f6a94ce48bda (patch) | |
| tree | fdca3dc04f5dce55978b3ef6016c1042b9d675e5 /libs/audioflinger/AudioFlinger.cpp | |
| parent | 562bb3db4f4475f5d933877d428097a6d1203605 (diff) | |
| parent | 9266c558bf1d21ff647525ff99f7dadbca417309 (diff) | |
| download | frameworks_base-0fda766e53fba7e829fe6e145738f6a94ce48bda.zip frameworks_base-0fda766e53fba7e829fe6e145738f6a94ce48bda.tar.gz frameworks_base-0fda766e53fba7e829fe6e145738f6a94ce48bda.tar.bz2 | |
Merge branch 'cupcake'
Diffstat (limited to 'libs/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | libs/audioflinger/AudioFlinger.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp index d4692ad..51b800c 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -38,7 +38,7 @@ #include <private/media/AudioTrackShared.h> -#include <hardware/AudioHardwareInterface.h> +#include <hardware_legacy/AudioHardwareInterface.h> #include "AudioMixer.h" #include "AudioFlinger.h" @@ -832,10 +832,15 @@ bool AudioFlinger::isMusicActive() const status_t AudioFlinger::setParameter(const char* key, const char* value) { - status_t result; + status_t result, result2; AutoMutex lock(mHardwareLock); mHardwareStatus = AUDIO_SET_PARAMETER; result = mAudioHardware->setParameter(key, value); + if (mA2dpAudioInterface) { + result2 = mA2dpAudioInterface->setParameter(key, value); + if (result2) + result = result2; + } mHardwareStatus = AUDIO_HW_IDLE; return result; } |