commit 4fc62bdba59ba7589f8f8ad20bbf4e56a60e289d
author Eric Laurent <elaurent@google.com> Wed Nov 26 12:10:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 26 12:10:03 2014 +0000
tree ea25f59bbe3d2f6b3d2fd1c67b114bfd69beac30
parent b75528a9ec04413de55e72ccd066658f2a8e7b29
parent be7bb9004c8663d145b998b6a6a349cb136dd6ae

am be7bb900: am 47f52f24: audio: new stream types

* commit 'be7bb9004c8663d145b998b6a6a349cb136dd6ae':
  audio: new stream types

include/system/audio.h

diff --git a/include/system/audio.h b/include/system/audio.h
index df454ff..2749ce0 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -57,10 +57,14 @@
                                         * and must be routed to speaker
                                         */
     AUDIO_STREAM_DTMF             = 8,
-    AUDIO_STREAM_TTS              = 9,
-
-    AUDIO_STREAM_CNT,
-    AUDIO_STREAM_MAX              = AUDIO_STREAM_CNT - 1,
+    AUDIO_STREAM_TTS              = 9,  /* Transmitted Through Speaker.
+                                         * Plays over speaker only, silent on other devices.
+                                         */
+    AUDIO_STREAM_ACCESSIBILITY    = 10, /* For accessibility talk back prompts */
+    AUDIO_STREAM_REROUTING        = 11, /* For dynamic policy output mixes */
+    AUDIO_STREAM_PATCH            = 12, /* For internal audio flinger tracks. Fixed volume */
+    AUDIO_STREAM_PUBLIC_CNT       = AUDIO_STREAM_TTS + 1,
+    AUDIO_STREAM_CNT              = AUDIO_STREAM_PATCH + 1,
 } audio_stream_type_t;
 
 /* Do not change these values without updating their counterparts