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

Commit b2130433 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "Mute: Update logging" into main am: ffbbaf1a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3001426



Change-Id: I3aaca7a18180a4e1cb5c8f3eb4d60bf50304445a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0da96e76 ffbbaf1a

services/audioflinger/AudioFlinger.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2551,6 +2551,7 @@ AudioHwDevice* AudioFlinger::loadHwModule_ll(const char *name) 
        bool mm;

        if (OK == dev->getMasterMute(&mm)) {

            mMasterMute = mm;

            ALOGI_IF(mMasterMute, "%s: applying mute from HAL %s", __func__, name);

        }

    }

services/audioflinger/Threads.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11061,7 +11061,7 @@ void MmapPlaybackThread::checkSilentMode_l() 
            char *endptr;

            unsigned long ul = strtoul(value, &endptr, 0);

            if (*endptr == '\0' && ul != 0) {

                ALOGD("Silence is golden");

                ALOGW("%s: mute from ro.audio.silent. Silence is golden", __func__);

                // The setprop command will not allow a property to be changed after

                // the first time it is set, so we don't have to worry about un-muting.

                setMasterMute_l(true);

services/audioflinger/Tracks.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ void Track::processMuteEvent_l(const sp< 


    if (result == OK) {

        ALOGI("%s(%d): processed mute state for port ID %d from %d to %d", __func__, id(), mPortId,

              int(muteState), int(mMuteState));

                static_cast<int>(mMuteState), static_cast<int>(muteState));

        mMuteState = muteState;

    } else {

        ALOGW("%s(%d): cannot process mute state for port ID %d, status error %d", __func__, id(),
@@ -3554,6 +3554,8 @@ void MmapTrack::processMuteEvent_l(const sp<IAudioManager>& audioManager, mute_s 
    }



    if (result == OK) {

        ALOGI("%s(%d): processed mute state for port ID %d from %d to %d", __func__, id(), mPortId,

                static_cast<int>(mMuteState), static_cast<int>(muteState));

        mMuteState = muteState;

    } else {

        ALOGW("%s(%d): cannot process mute state for port ID %d, status error %d",