diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-05-05 15:55:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 15:55:08 +0000 |
| commit | 9f578d3297782be6de5373e171f3b4af49726709 (patch) | |
| tree | d6063a06edf2c17868195472d63869c069dbfbb8 /services/audioflinger/AudioFlinger.cpp | |
| parent | c8a70d340f0ce610dfb8bd44d833708269484e99 (diff) | |
| parent | 4cb668392ee0433462251afbee109405c6efacc8 (diff) | |
| download | frameworks_av-9f578d3297782be6de5373e171f3b4af49726709.zip frameworks_av-9f578d3297782be6de5373e171f3b4af49726709.tar.gz frameworks_av-9f578d3297782be6de5373e171f3b4af49726709.tar.bz2 | |
Merge "AudioRecord keeps track of UID" into mnc-dev
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index bd6889d..485e320 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1425,6 +1425,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( size_t *frameCount, IAudioFlinger::track_flags_t *flags, pid_t tid, + int clientUid, int *sessionId, size_t *notificationFrames, sp<IMemory>& cblk, @@ -1494,8 +1495,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( // TODO: the uid should be passed in as a parameter to openRecord recordTrack = thread->createRecordTrack_l(client, sampleRate, format, channelMask, frameCount, lSessionId, notificationFrames, - IPCThreadState::self()->getCallingUid(), - flags, tid, &lStatus); + clientUid, flags, tid, &lStatus); LOG_ALWAYS_FATAL_IF((lStatus == NO_ERROR) && (recordTrack == 0)); if (lStatus == NO_ERROR) { |