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

Commit 736f5fb6 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "StreamHal: Enable audio power log for user builds"

parents 82e8615f 8c2e5821

media/libaudiohal/impl/StreamHalHidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ StreamHalHidl::StreamHalHidl(IStream *stream) 


    // Instrument audio signal power logging.

    // Note: This assumes channel mask, format, and sample rate do not change after creation.

    if (mStream != nullptr && mStreamPowerLog.isUserDebugOrEngBuild()) {

    if (mStream != nullptr /* && mStreamPowerLog.isUserDebugOrEngBuild() */) {

        // Obtain audio properties (see StreamHalHidl::getAudioProperties() below).

        Return<void> ret = mStream->getAudioProperties(

                [&](auto sr, auto m, auto f) {

media/libaudiohal/impl/StreamHalLocal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ StreamHalLocal::StreamHalLocal(audio_stream_t *stream, sp<DeviceHalLocal> device 
          mStream(stream) {

    // Instrument audio signal power logging.

    // Note: This assumes channel mask, format, and sample rate do not change after creation.

    if (mStream != nullptr && mStreamPowerLog.isUserDebugOrEngBuild()) {

    if (mStream != nullptr /* && mStreamPowerLog.isUserDebugOrEngBuild() */) {

        mStreamPowerLog.init(mStream->get_sample_rate(mStream),

                mStream->get_channels(mStream),

                mStream->get_format(mStream));