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

Commit 0211cd91 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android Build Cherrypicker Worker
Browse files

Send 'closing=true' from StreamOutHalHidl::exit 

Combine sending of 'closing=true' with 'exiting=1' for legacy
HALs. Historically, the remote submix HAL was using a separate
notification because initially 'closing=true' was only sent
for the A2DP output. Unify sending of these parameters as in
the AIDL HAL interface we only use the thread exiting condition
to notify the HAL about the need to stop its output.

Bug: 73175392
Test: manual check of A2DP connection, disconnection, switching
      "Mono audio" on and off;
      manual check of screen recording with audio
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1579be6d8afe1d369744b0153b5254b655e993e0)
Merged-In: I722e5dadbab252ccae29eedad92e568ffe664b4d
Change-Id: I722e5dadbab252ccae29eedad92e568ffe664b4d
parent 169f9061

media/libaudiohal/impl/StreamHalHidl.cpp

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

}





status_t StreamOutHalHidl::exit() {

status_t StreamOutHalHidl::exit() {

    // Signal exiting to remote_submix HAL.

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

    AudioParameter param;

    AudioParameter param;

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

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

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

    return setParameters(param.toString());

    return setParameters(param.toString());

}

}

media/libmediahelper/include/media/AudioParameter.h

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

    static const char * const keyScreenState;

    static const char * const keyScreenRotation;

    static const char * const keyScreenRotation;





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

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

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

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

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

    static const char * const keyClosing;

    static const char * const keyClosing;

    static const char * const keyExiting;

    static const char * const keyExiting;

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

+0 −6
Original line number Original line 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);

        mClientInterface->closeOutput(mIoHandle);





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

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