summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy/AudioPolicyManager.h
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-12-17 17:30:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-17 17:30:50 +0000
commit277c7b8c41436125742339d8c80bccf0f2b086d9 (patch)
treebbb776ccbbd2e1ea760e1bbd95c5c96f4adbcfe6 /services/audiopolicy/AudioPolicyManager.h
parent045e710f8ce7ce1679b9b5f0adbd3290c4cc6f54 (diff)
parent97bb33f58d742539f3382583d7978fca71ffa2d5 (diff)
downloadframeworks_av-277c7b8c41436125742339d8c80bccf0f2b086d9.zip
frameworks_av-277c7b8c41436125742339d8c80bccf0f2b086d9.tar.gz
frameworks_av-277c7b8c41436125742339d8c80bccf0f2b086d9.tar.bz2
Merge "Fix permission check for audio recording" into lmp-mr1-dev
Diffstat (limited to 'services/audiopolicy/AudioPolicyManager.h')
-rw-r--r--services/audiopolicy/AudioPolicyManager.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h
index e9eac19..2059f58 100644
--- a/services/audiopolicy/AudioPolicyManager.h
+++ b/services/audiopolicy/AudioPolicyManager.h
@@ -112,7 +112,8 @@ public:
uint32_t samplingRate,
audio_format_t format,
audio_channel_mask_t channelMask,
- audio_input_flags_t flags);
+ audio_input_flags_t flags,
+ input_type_t *inputType);
// indicates to the audio policy manager that the input starts being used.
virtual status_t startInput(audio_io_handle_t input,