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

Commit dd1feb52 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Send 'closing=true' from StreamOutHalHidl::exit"

parents 169f9061 0211cd91

media/libaudiohal/impl/StreamHalHidl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -979,9 +979,10 @@ void StreamOutHalHidl::onRecommendedLatencyModeChanged( 
}



status_t StreamOutHalHidl::exit() {

    // Signal exiting to remote_submix HAL.

    // Signal exiting to HALs that use intermediate pipes to close them.

    AudioParameter param;

    param.addInt(String8(AudioParameter::keyExiting), 1);

    param.add(String8(AudioParameter::keyClosing), String8(AudioParameter::valueTrue));

    return setParameters(param.toString());

}

media/libmediahelper/include/media/AudioParameter.h

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ public: 
    static const char * const keyScreenState;

    static const char * const keyScreenRotation;



    // TODO(b/73175392) consider improvement to AIDL StreamOut interface.

    // keyClosing: "true" when AudioOutputDescriptor is closing.  Used by A2DP HAL.

    // keyClosing: "true" on AudioFlinger Thread preExit.  Used by A2DP HAL.

    // keyExiting: "1" on AudioFlinger Thread preExit.  Used by remote_submix and A2DP HAL.

    static const char * const keyClosing;

    static const char * const keyExiting;

services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp

+0 −6
Original line number Diff line number Diff line
@@ -674,12 +674,6 @@ void SwAudioOutputDescriptor::close() 
            }

        }



        // TODO(b/73175392) consider improving the AIDL interface.

        // Signal closing to A2DP HAL.

        AudioParameter param;

        param.add(String8(AudioParameter::keyClosing), String8("true"));

        mClientInterface->setParameters(mIoHandle, param.toString());



        mClientInterface->closeOutput(mIoHandle);



        LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",