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

Commit 7277e17b authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Fix issue 2378022: AudioService should direct volume control to... 

Merge "Fix issue 2378022: AudioService should direct volume control to STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active."
parents 37113842 43c0b0a1

libs/audioflinger/AudioFlinger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -544,11 +544,11 @@ bool AudioFlinger::streamMute(int stream) const 
    return mStreamTypes[stream].mute;

}



bool AudioFlinger::isMusicActive() const

bool AudioFlinger::isStreamActive(int stream) const

{

    Mutex::Autolock _l(mLock);

    for (uint32_t i = 0; i < mPlaybackThreads.size(); i++) {

        if (mPlaybackThreads.valueAt(i)->isMusicActive()) {

        if (mPlaybackThreads.valueAt(i)->isStreamActive(stream)) {

            return true;

        }

    }
@@ -1071,7 +1071,7 @@ bool AudioFlinger::PlaybackThread::streamMute(int stream) const 
    return mStreamTypes[stream].mute;

}



bool AudioFlinger::PlaybackThread::isMusicActive() const

bool AudioFlinger::PlaybackThread::isStreamActive(int stream) const

{

    Mutex::Autolock _l(mLock);

    size_t count = mActiveTracks.size();
@@ -1079,7 +1079,7 @@ bool AudioFlinger::PlaybackThread::isMusicActive() const 
        sp<Track> t = mActiveTracks[i].promote();

        if (t == 0) continue;

        Track* const track = t.get();

        if (t->type() == AudioSystem::MUSIC)

        if (t->type() == stream)

            return true;

    }

    return false;

libs/audioflinger/AudioFlinger.h

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public: 
    virtual     status_t    setMicMute(bool state);

    virtual     bool        getMicMute() const;



    virtual     bool        isMusicActive() const;

    virtual     bool        isStreamActive(int stream) const;



    virtual     status_t    setParameters(int ioHandle, const String8& keyValuePairs);

    virtual     String8     getParameters(int ioHandle, const String8& keys);
@@ -506,7 +506,7 @@ private: 
        virtual     float       streamVolume(int stream) const;

        virtual     bool        streamMute(int stream) const;



                    bool        isMusicActive() const;

                    bool        isStreamActive(int stream) const;



                    sp<Track>   createTrack_l(

                                    const sp<AudioFlinger::Client>& client,