diff options
author | Dima Zavin <dima@android.com> | 2011-06-13 19:43:59 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-13 19:43:59 -0700 |
commit | 3f1545d22a71f960c9598a24e7e48ec16dd16267 (patch) | |
tree | 82184e372100ca1daa68d6b98e2bc8d9a40214e0 /include | |
parent | 04cf3b24dcfefb2da0864adde0f51a7f49c351f4 (diff) | |
parent | 7394a4f358fa9908a9f0a7c954b65c399f4268e6 (diff) | |
download | frameworks_av-3f1545d22a71f960c9598a24e7e48ec16dd16267.zip frameworks_av-3f1545d22a71f960c9598a24e7e48ec16dd16267.tar.gz frameworks_av-3f1545d22a71f960c9598a24e7e48ec16dd16267.tar.bz2 |
Merge "audio: update for audio/audio_policy header names/locations"
Diffstat (limited to 'include')
-rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
-rw-r--r-- | include/media/IAudioPolicyService.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 68cd188..89213b7 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -22,7 +22,7 @@ #include <media/IAudioFlinger.h> #include <system/audio.h> -#include <hardware/audio_policy.h> +#include <system/audio_policy.h> /* XXX: Should be include by all the users instead */ #include <media/AudioParameter.h> diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 09b2bfe..0fc8dbf 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -26,7 +26,7 @@ #include <binder/IInterface.h> #include <media/AudioSystem.h> -#include <hardware/audio_policy.h> +#include <system/audio_policy.h> namespace android { |