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

Commit b4dc74cc authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Restrict setting silenced in RecordTrack." into pi-dev 

am: 70376b12

Change-Id: I158012e95a1c19b60afef2143514296fa3ab332c
parents af36b9ae 70376b12

services/audioflinger/RecordTracks.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public: 


    virtual bool        isFastTrack() const { return (mFlags & AUDIO_INPUT_FLAG_FAST) != 0; }



            void        setSilenced(bool silenced) { mSilenced = silenced; }

            void        setSilenced(bool silenced) { if (!isPatchTrack()) mSilenced = silenced; }

            bool        isSilenced() const { return mSilenced; }



            status_t    getActiveMicrophones(std::vector<media::MicrophoneInfo>* activeMicrophones);

services/audioflinger/Tracks.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,8 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack( 
        mFramesToDrop(0),

        mResamplerBufferProvider(NULL), // initialize in case of early constructor exit

        mRecordBufferConverter(NULL),

        mFlags(flags)

        mFlags(flags),

        mSilenced(false)

{

    if (mCblk == NULL) {

        return;