summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-04-13 22:43:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-13 22:43:07 +0000
commit221a33890fa8b3c3c43c94327305b8e7717c412f (patch)
tree6953a583833355b48db57da5d3a326e505f96aaa /services/audioflinger
parentdb93079daf06a94e50622d0383b9ed8e767e2f92 (diff)
parentab300c8cbf5df98fddca39e8d1698b0307432152 (diff)
downloadframeworks_av-221a33890fa8b3c3c43c94327305b8e7717c412f.zip
frameworks_av-221a33890fa8b3c3c43c94327305b8e7717c412f.tar.gz
frameworks_av-221a33890fa8b3c3c43c94327305b8e7717c412f.tar.bz2
Merge "audio polciy: remove FM audio capture permission."
Diffstat (limited to 'services/audioflinger')
-rw-r--r--services/audioflinger/ServiceUtilities.cpp7
-rw-r--r--services/audioflinger/ServiceUtilities.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/services/audioflinger/ServiceUtilities.cpp b/services/audioflinger/ServiceUtilities.cpp
index fae19a1..8246fef 100644
--- a/services/audioflinger/ServiceUtilities.cpp
+++ b/services/audioflinger/ServiceUtilities.cpp
@@ -50,13 +50,6 @@ bool captureHotwordAllowed() {
return ok;
}
-bool captureFmTunerAllowed() {
- static const String16 sCaptureFmTunerAllowed("android.permission.ACCESS_FM_RADIO");
- bool ok = checkCallingPermission(sCaptureFmTunerAllowed);
- if (!ok) ALOGE("android.permission.ACCESS_FM_RADIO");
- return ok;
-}
-
bool settingsAllowed() {
if (getpid_cached == IPCThreadState::self()->getCallingPid()) return true;
static const String16 sAudioSettings("android.permission.MODIFY_AUDIO_SETTINGS");
diff --git a/services/audioflinger/ServiceUtilities.h b/services/audioflinger/ServiceUtilities.h
index ce18a90..df6f6f4 100644
--- a/services/audioflinger/ServiceUtilities.h
+++ b/services/audioflinger/ServiceUtilities.h
@@ -23,7 +23,6 @@ extern pid_t getpid_cached;
bool recordingAllowed();
bool captureAudioOutputAllowed();
bool captureHotwordAllowed();
-bool captureFmTunerAllowed();
bool settingsAllowed();
bool modifyAudioRoutingAllowed();
bool dumpAllowed();