diff options
| author | Eric Laurent <elaurent@google.com> | 2012-10-08 09:04:34 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-10-08 17:00:02 -0700 |
| commit | dd45d01128423a82652a3c9d77fa393631d95229 (patch) | |
| tree | 4687f5a52053ab197d9ecfb7bf1a1e5684346224 /core/res | |
| parent | 0e2aade9f1cfbbbdb60889ca9e1399093eb542ac (diff) | |
| download | frameworks_base-dd45d01128423a82652a3c9d77fa393631d95229.zip frameworks_base-dd45d01128423a82652a3c9d77fa393631d95229.tar.gz frameworks_base-dd45d01128423a82652a3c9d77fa393631d95229.tar.bz2 | |
enforce camera sound according to country code
Use mcc config overlay mechanism to enforce camera shutter sounds
in countries where it is mandatory.
Property ro.camera.sound.forced is not needed anymore.
When camera sound is forced, STREAM_SYSTEM_ENFORCED is removed from
streams affected by ringer mode and its volume is
maxed out. AudioSystem.FORCE_SYSTEM_ENFORCED is sent to audio
policy manager to alter the routing policy for STREAM_SYSTEM_ENFORCED.
Also fix streams being unmuted when settings are reloaded
upon user switch while in silent mode.
Add ringer mode to audio service dump.
Bug 7032634.
Change-Id: Iceea5bba3b8d3aabf8e42b222deb33a893dc8f38
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values-mcc440/config.xml | 25 | ||||
| -rwxr-xr-x | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/core/res/res/values-mcc440/config.xml b/core/res/res/values-mcc440/config.xml new file mode 100644 index 0000000..4ca1677 --- /dev/null +++ b/core/res/res/values-mcc440/config.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Whether camera shutter sound is forced or not (country specific). --> + <bool name="config_camera_sound_forced">true</bool> + +</resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 16960c8..a00f071 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -981,4 +981,7 @@ --> <bool name="config_wifiDisplaySupportsProtectedBuffers">false</bool> + <!-- Whether camera shutter sound is forced or not (country specific). --> + <bool name="config_camera_sound_forced">false</bool> + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 281d92a..e615fd4 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -275,6 +275,7 @@ <java-symbol type="bool" name="config_enableWifiDisplay" /> <java-symbol type="bool" name="config_useDevInputEventForAudioJack" /> <java-symbol type="bool" name="config_safe_media_volume_enabled" /> + <java-symbol type="bool" name="config_camera_sound_forced" /> <java-symbol type="integer" name="config_cursorWindowSize" /> <java-symbol type="integer" name="config_longPressOnPowerBehavior" /> |