Merge from AOSP

Change-Id: Iedb6ea4e1cf66edda8d91e3d432cb010e697ed44
2012-04-24 17:38:49 -07:00 · 2012-04-24 17:38:49 -07:00 · 307d9cfc16
parent 980a59b45d e4e3f20f57
commit 307d9cfc16
1 changed files with 3 additions and 0 deletions
--- a/include/system/audio_policy.h
+++ b/include/system/audio_policy.h
@ -38,6 +38,9 @@ typedef enum {
    AUDIO_POLICY_OUTPUT_FLAG_DIRECT = 0x1
 } audio_policy_output_flags_t;

+/* for future compatibility */
+typedef audio_policy_output_flags_t audio_output_flags_t;
+
 /* device categories used for audio_policy->set_force_use() */
 typedef enum {
    AUDIO_POLICY_FORCE_NONE,