commit 5c9f25da9c6d02ba2a28bc5a41d6d3d7b2489aab
author Jon Eklund <jeklund@motorola.com> Thu Sep 11 18:30:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 11 18:30:51 2014 +0000
tree 7efc0ee201052cddfe71f13e3adf831107c49fc7
parent dccbb07dfbdd23016eff1de5b9c14ac3c5999cfd
parent fcfa86403e206e2caa519299939480cb45deb8ba

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

include/system/audio.h

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 @@
     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 @@
                                  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 |