Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75180715 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "RecordTrack::createRecordTrack_l flags are in/out"

parents 3aa03e40 ddb0ccf3

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( 
        // create new record track.

        // The record track uses one track in mHardwareMixerThread by convention.

        recordTrack = thread->createRecordTrack_l(client, sampleRate, format, channelMask,

                                                  frameCount, lSessionId, *flags, tid, &lStatus);

                                                  frameCount, lSessionId, flags, tid, &lStatus);

    }

    if (lStatus != NO_ERROR) {

        // remove local strong reference to Client before deleting the RecordTrack so that the

services/audioflinger/Threads.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4433,7 +4433,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createR 
        audio_channel_mask_t channelMask,

        size_t frameCount,

        int sessionId,

        IAudioFlinger::track_flags_t flags,

        IAudioFlinger::track_flags_t *flags,

        pid_t tid,

        status_t *status)

{

services/audioflinger/Threads.h

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ public: 
                    audio_channel_mask_t channelMask,

                    size_t frameCount,

                    int sessionId,

                    IAudioFlinger::track_flags_t flags,

                    IAudioFlinger::track_flags_t *flags,

                    pid_t tid,

                    status_t *status);