summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-12-17 17:43:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-17 17:43:21 +0000
commit93118cd96233b682be95a3eb114d88d69c8cc416 (patch)
tree64f81b51b6071954122e612e860d2ed106e48a93 /services/audioflinger/AudioFlinger.cpp
parent3af7b7291bcd9b1b30dd11a8bedbdc63cc74b5a9 (diff)
parent99429b40411790b85e19c57392bbd292a237c470 (diff)
downloadframeworks_av-93118cd96233b682be95a3eb114d88d69c8cc416.zip
frameworks_av-93118cd96233b682be95a3eb114d88d69c8cc416.tar.gz
frameworks_av-93118cd96233b682be95a3eb114d88d69c8cc416.tar.bz2
am 99429b40: am 277c7b8c: Merge "Fix permission check for audio recording" into lmp-mr1-dev
* commit '99429b40411790b85e19c57392bbd292a237c470': Fix permission check for audio recording
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r--services/audioflinger/AudioFlinger.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 71e6f83..993db73 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1433,13 +1433,6 @@ sp<IAudioRecord> AudioFlinger::openRecord(
goto Exit;
}
- if (deviceRequiresCaptureAudioOutputPermission(thread->inDevice())
- && !captureAudioOutputAllowed()) {
- ALOGE("openRecord() permission denied: capture not allowed");
- lStatus = PERMISSION_DENIED;
- goto Exit;
- }
-
pid_t pid = IPCThreadState::self()->getCallingPid();
client = registerPid(pid);