summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJon Eklund <jeklund@motorola.com>2014-09-11 18:30:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-11 18:30:51 +0000
commit5c9f25da9c6d02ba2a28bc5a41d6d3d7b2489aab (patch)
tree7efc0ee201052cddfe71f13e3adf831107c49fc7 /include
parentdccbb07dfbdd23016eff1de5b9c14ac3c5999cfd (diff)
parentfcfa86403e206e2caa519299939480cb45deb8ba (diff)
downloadsystem_core-5c9f25da9c6d02ba2a28bc5a41d6d3d7b2489aab.zip
system_core-5c9f25da9c6d02ba2a28bc5a41d6d3d7b2489aab.tar.gz
system_core-5c9f25da9c6d02ba2a28bc5a41d6d3d7b2489aab.tar.bz2
am fcfa8640: audio.h: Add "safe speaker" device for limited-loudness use cases
* commit 'fcfa86403e206e2caa519299939480cb45deb8ba': audio.h: Add "safe speaker" device for limited-loudness use cases
Diffstat (limited to 'include')
-rw-r--r--include/system/audio.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/system/audio.h b/include/system/audio.h
index 1c70240..0eb28b0 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -585,6 +585,8 @@ enum {
AUDIO_DEVICE_OUT_FM = 0x100000,
/* Line out for av devices */
AUDIO_DEVICE_OUT_AUX_LINE = 0x200000,
+ /* limited-output speaker device for acoustic safety */
+ AUDIO_DEVICE_OUT_SPEAKER_SAFE = 0x400000,
AUDIO_DEVICE_OUT_DEFAULT = AUDIO_DEVICE_BIT_DEFAULT,
AUDIO_DEVICE_OUT_ALL = (AUDIO_DEVICE_OUT_EARPIECE |
AUDIO_DEVICE_OUT_SPEAKER |
@@ -608,6 +610,7 @@ enum {
AUDIO_DEVICE_OUT_SPDIF |
AUDIO_DEVICE_OUT_FM |
AUDIO_DEVICE_OUT_AUX_LINE |
+ AUDIO_DEVICE_OUT_SPEAKER_SAFE |
AUDIO_DEVICE_OUT_DEFAULT),
AUDIO_DEVICE_OUT_ALL_A2DP = (AUDIO_DEVICE_OUT_BLUETOOTH_A2DP |
AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |