diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-12-17 17:49:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 17:49:57 +0000 |
commit | a268a817fb9df2a266f06b58680fa4168517c8cd (patch) | |
tree | 0a2d597a6d69559f7e81fcb3838d94b9a44238a2 /services/audioflinger/AudioFlinger.cpp | |
parent | a73d8dba2785771302dde66c369dc6cbae3b170b (diff) | |
parent | 93118cd96233b682be95a3eb114d88d69c8cc416 (diff) | |
download | frameworks_av-a268a817fb9df2a266f06b58680fa4168517c8cd.zip frameworks_av-a268a817fb9df2a266f06b58680fa4168517c8cd.tar.gz frameworks_av-a268a817fb9df2a266f06b58680fa4168517c8cd.tar.bz2 |
am 93118cd9: am 99429b40: am 277c7b8c: Merge "Fix permission check for audio recording" into lmp-mr1-dev
* commit '93118cd96233b682be95a3eb114d88d69c8cc416':
Fix permission check for audio recording
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index aee805a..9db313e 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1436,13 +1436,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); |