diff options
| author | Eric Laurent <> | 2009-03-27 16:27:16 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 16:27:16 -0700 |
| commit | a845f672e491ec3567709501f8af8d3661f184e7 (patch) | |
| tree | 252656d31faf4fc51988cb6345f7d5f51cfbf003 /include | |
| parent | cd6725a333395ffeac3215ea4bf834a95aaa8def (diff) | |
| download | frameworks_av-a845f672e491ec3567709501f8af8d3661f184e7.zip frameworks_av-a845f672e491ec3567709501f8af8d3661f184e7.tar.gz frameworks_av-a845f672e491ec3567709501f8af8d3661f184e7.tar.bz2 | |
AI 143177: am: CL 142889 Fix issue #1736153 Camera shutter sound can be muted by new AlarmClock setting.
Current implementation of Camera service plays the camera shutter sound over the ALARM stream so that it cannot be muted by silent mode in order to comply to some country specific requirement. A recent change made it possible for the user to mute the ALARM stream thus making this stream not suitable any more for the camera shutter sound.
The fix consists in creating a new stream type only accessible by native code and that cannot be muted and use it to play camera sounds.
Original author: elaurent
Merged from: //branches/cupcake/...
Automated import of CL 143177
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 77c90ba..3a3a714 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -38,6 +38,7 @@ public: ALARM = 4, NOTIFICATION = 5, BLUETOOTH_SCO = 6, + ENFORCED_AUDIBLE = 7, // Sounds that cannot be muted by user and must be routed to speaker NUM_STREAM_TYPES }; |