diff options
| author | mosimchah <mosimchah@gmail.com> | 2019-12-12 10:55:36 -0500 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2019-12-12 10:55:36 -0500 |
| commit | f6f51160bbaa8efe90bb299b76de7bc4e5253ef2 (patch) | |
| tree | 047753c32a9b4b1c1d1842aaecbad1998b14ded8 /services/audioflinger/Threads.cpp | |
| parent | b495c9cd3b251bdfc1a29f91ac920fb945957db9 (diff) | |
| parent | e79a0716216edade8100dd4d6b05a69e80ce25ed (diff) | |
Merge tag 'android-9.0.0_r51' of https://android.googlesource.com/platform/frameworks/av into HEADp9.0
Android 9.0.0 Release 51 (5948683)
* tag 'android-9.0.0_r51' of https://android.googlesource.com/platform/frameworks/av:
AudioFlinger: enforce OP_RECORD_AUDIO during recording
Change-Id: Ia7fb2538d25c9610abfef0a0c8e73f71f712bc33
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index dcad8660a9..499342001b 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -6778,7 +6778,7 @@ reacquire_wakelock: // Sanitize before releasing if the track has no access to the source data // An idle UID receives silence from non virtual devices until active if (activeTrack->isSilenced()) { - memset(activeTrack->mSink.raw, 0, framesOut * mFrameSize); + memset(activeTrack->mSink.raw, 0, framesOut * activeTrack->frameSize()); } activeTrack->releaseBuffer(&activeTrack->mSink); } @@ -6921,7 +6921,8 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe audio_input_flags_t *flags, pid_t tid, status_t *status, - audio_port_handle_t portId) + audio_port_handle_t portId, + const String16& opPackageName) { size_t frameCount = *pFrameCount; size_t notificationFrameCount = *pNotificationFrameCount; @@ -7047,7 +7048,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe track = new RecordTrack(this, client, attr, sampleRate, format, channelMask, frameCount, nullptr /* buffer */, (size_t)0 /* bufferSize */, sessionId, uid, - *flags, TrackBase::TYPE_DEFAULT, portId); + *flags, TrackBase::TYPE_DEFAULT, opPackageName, portId); lStatus = track->initCheck(); if (lStatus != NO_ERROR) { |