summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-10-09 11:34:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-09 11:34:32 -0700
commit915b08fe3e65c8391a60404c52c1f87a4499eaab (patch)
tree516870a80b475be092300b6de6fbb38f66b737aa /services/audioflinger
parenta232d6a3a8a78a601689fdc98bf2901778dd5c2c (diff)
parent80dfc5dc7ec6d20beb0360e8efcc5331f4d25d06 (diff)
downloadframeworks_av-915b08fe3e65c8391a60404c52c1f87a4499eaab.zip
frameworks_av-915b08fe3e65c8391a60404c52c1f87a4499eaab.tar.gz
frameworks_av-915b08fe3e65c8391a60404c52c1f87a4499eaab.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/audioflinger')
-rw-r--r--services/audioflinger/AudioPolicyService.cpp4
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