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 | 922261deab46b93641eadd9bc337fa72f8a5d734 (patch) | |
| tree | 9728dbd9e79c18efd5bc491039d7df714b0dc4d3 /include/media | |
| parent | 82f0a85c3ba81cb6932d956c1c8cc5a99e89052a (diff) | |
| parent | 290029d19a9d314e925b73e19453ab0497602f80 (diff) | |
| download | frameworks_base-922261deab46b93641eadd9bc337fa72f8a5d734.zip frameworks_base-922261deab46b93641eadd9bc337fa72f8a5d734.tar.gz frameworks_base-922261deab46b93641eadd9bc337fa72f8a5d734.tar.bz2 | |
Merge "audio: update for audio/audio_policy header names/locations"
Diffstat (limited to 'include/media')
| -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 { |