diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-11-15 00:38:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-15 00:38:55 +0000 |
| commit | 14a74010125880ff30386b69e21310f38008e0eb (patch) | |
| tree | 7d99052ecb2f3686a3a70b16fa9fc554eefbbecb | |
| parent | a82b5f575d0b7f9465cd879be04929fefd4cc5c5 (diff) | |
| parent | c84d9d235679a4d48245b316b7b2e4c0b19413e7 (diff) | |
| download | frameworks_av-14a74010125880ff30386b69e21310f38008e0eb.zip frameworks_av-14a74010125880ff30386b69e21310f38008e0eb.tar.gz frameworks_av-14a74010125880ff30386b69e21310f38008e0eb.tar.bz2 | |
Merge "Include AudioPolicyInterface.h only when needed."
| -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" |