diff options
| author | Eric Laurent <elaurent@google.com> | 2012-10-09 11:34:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-09 11:34:32 -0700 |
| commit | 1e908f4d342f7c7f0535d254837fc2e95a535650 (patch) | |
| tree | d864464943b8a9cf67015cb55ce44a360800278a /services | |
| parent | d92e9a30bf30151099468dece88c8dda52b9186c (diff) | |
| parent | 3db8b1f24d8266e24797a5095521521f177f4809 (diff) | |
| download | frameworks_av-1e908f4d342f7c7f0535d254837fc2e95a535650.zip frameworks_av-1e908f4d342f7c7f0535d254837fc2e95a535650.tar.gz frameworks_av-1e908f4d342f7c7f0535d254837fc2e95a535650.tar.bz2 | |
am 80dfc5dc: am 350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
* commit '80dfc5dc7ec6d20beb0360e8efcc5331f4d25d06':
audio policy: deprecate ro.camera.sound.forced
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index 3a2dbe2..155a0b8 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -91,10 +91,6 @@ AudioPolicyService::AudioPolicyService() if (rc) return; - property_get("ro.camera.sound.forced", value, "0"); - forced_val = strtol(value, NULL, 0); - mpAudioPolicy->set_can_mute_enforced_audible(mpAudioPolicy, !forced_val); - ALOGI("Loaded audio policy from %s (%s)", module->name, module->id); // load audio pre processing modules |