diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-11-15 00:47:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-15 00:47:39 +0000 |
| commit | 7aa310d90179d3811f7581c914e970c2461db7cf (patch) | |
| tree | 11a43b408c25102481e75d210056dc10aceb3a1e /services/audiopolicy | |
| parent | 27c3f7728c6c576c49245a7bd9688505ec1f5357 (diff) | |
| parent | 0ef3210f77799b5e0086c7a0f9244aefdf403805 (diff) | |
| download | frameworks_av-7aa310d90179d3811f7581c914e970c2461db7cf.zip frameworks_av-7aa310d90179d3811f7581c914e970c2461db7cf.tar.gz frameworks_av-7aa310d90179d3811f7581c914e970c2461db7cf.tar.bz2 | |
am 0ef3210f: am 14a74010: Merge "Include AudioPolicyInterface.h only when needed."
* commit '0ef3210f77799b5e0086c7a0f9244aefdf403805':
Include AudioPolicyInterface.h only when needed.
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyService.cpp | 1 | ||||
| -rw-r--r-- | services/audiopolicy/AudioPolicyService.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyService.cpp b/services/audiopolicy/AudioPolicyService.cpp index dd4067f..3a5626d 100644 --- a/services/audiopolicy/AudioPolicyService.cpp +++ b/services/audiopolicy/AudioPolicyService.cpp @@ -35,6 +35,7 @@ #include <hardware_legacy/power.h> #include <media/AudioEffect.h> #include <media/EffectsFactoryApi.h> +#include <media/AudioParameter.h> #include <hardware/hardware.h> #include <system/audio.h> diff --git a/services/audiopolicy/AudioPolicyService.h b/services/audiopolicy/AudioPolicyService.h index 4e68ab1..a09c084 100644 --- a/services/audiopolicy/AudioPolicyService.h +++ b/services/audiopolicy/AudioPolicyService.h @@ -30,7 +30,9 @@ #include <media/IAudioPolicyService.h> #include <media/ToneGenerator.h> #include <media/AudioEffect.h> +#ifdef USE_LEGACY_AUDIO_POLICY #include <hardware_legacy/AudioPolicyInterface.h> +#endif #include "AudioPolicyEffects.h" #include "AudioPolicyManager.h" |