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

Commit 7695e9b7 authored by Andy Hung's avatar Andy Hung
Browse files

Remove setStreamVolume and setStreamMute 

Flag: EXEMPT bugfix
Test: atest CtsMediaAudioTestCases
Test: atest audiopolicy_tests
Bug: 424602141
Change-Id: I36b79cdb7f4d98656124d59f408ab19eb0518aff
parent 4219bb00

media/libaudioclient/AudioSystem.cpp

+0 −17
Original line number Diff line number Diff line
@@ -387,23 +387,6 @@ status_t AudioSystem::getMasterMute(bool* mute) { 
    return NO_ERROR;

}



status_t AudioSystem::setStreamVolume(audio_stream_type_t stream, float value,

                                      bool muted, audio_io_handle_t output) {

    if (uint32_t(stream) >= AUDIO_STREAM_CNT) return BAD_VALUE;

    const sp<IAudioFlinger> af = get_audio_flinger();

    if (af == nullptr) return AudioFlingerServiceTraits::getError();

    af->setStreamVolume(stream, value, muted, output);

    return NO_ERROR;

}



status_t AudioSystem::setStreamMute(audio_stream_type_t stream, bool mute) {

    if (uint32_t(stream) >= AUDIO_STREAM_CNT) return BAD_VALUE;

    const sp<IAudioFlinger> af = get_audio_flinger();

    if (af == nullptr) return AudioFlingerServiceTraits::getError();

    af->setStreamMute(stream, mute);

    return NO_ERROR;

}



status_t AudioSystem::setPortsVolume(

        const std::vector<audio_port_handle_t>& portIds, float volume, bool muted,

        audio_io_handle_t output) {

media/libaudioclient/IAudioFlinger.cpp

+0 −31
Original line number Diff line number Diff line
@@ -336,21 +336,6 @@ status_t AudioFlingerClientAdapter::getMasterBalance(float* balance) const{ 
    return statusTFromBinderStatus(mDelegate->getMasterBalance(balance));

}



status_t AudioFlingerClientAdapter::setStreamVolume(audio_stream_type_t stream, float value,

                                                    bool muted, audio_io_handle_t output) {

    AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_stream_type_t_AudioStreamType(stream));

    int32_t outputAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(output));

    return statusTFromBinderStatus(

            mDelegate->setStreamVolume(streamAidl, value, muted, outputAidl));

}



status_t AudioFlingerClientAdapter::setStreamMute(audio_stream_type_t stream, bool muted) {

    AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_stream_type_t_AudioStreamType(stream));

    return statusTFromBinderStatus(mDelegate->setStreamMute(streamAidl, muted));

}



status_t AudioFlingerClientAdapter::setPortsVolume(

        const std::vector<audio_port_handle_t> &portIds, float volume, bool muted,

        audio_io_handle_t output) {
@@ -1010,22 +995,6 @@ Status AudioFlingerServerAdapter::getMasterBalance(float* _aidl_return) { 
    return Status::fromStatusT(mDelegate->getMasterBalance(_aidl_return));

}



Status AudioFlingerServerAdapter::setStreamVolume(AudioStreamType stream, float value,

                                                  bool muted, int32_t output) {

    audio_stream_type_t streamLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_AudioStreamType_audio_stream_type_t(stream));

    audio_io_handle_t outputLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_int32_t_audio_io_handle_t(output));

    return Status::fromStatusT(

            mDelegate->setStreamVolume(streamLegacy, value, muted, outputLegacy));

}



Status AudioFlingerServerAdapter::setStreamMute(AudioStreamType stream, bool muted) {

    audio_stream_type_t streamLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_AudioStreamType_audio_stream_type_t(stream));

    return Status::fromStatusT(mDelegate->setStreamMute(streamLegacy, muted));

}



Status AudioFlingerServerAdapter::setPortsVolume(

        const std::vector<int32_t>& portIds, float volume, bool muted, int32_t output) {

    std::vector<audio_port_handle_t> portIdsLegacy = VALUE_OR_RETURN_BINDER(

media/libaudioclient/aidl/android/media/IAudioFlingerService.aidl

+0 −9
Original line number Diff line number Diff line
@@ -93,15 +93,6 @@ interface IAudioFlingerService { 
    void setMasterBalance(float balance);

    float getMasterBalance();



    /*

     * Set stream type state. This will probably be used by

     * the preference panel, mostly.

     * This method is deprecated. Please use the setPortsVolume method instead.

     */

    void setStreamVolume(AudioStreamType stream, float value, boolean muted,

            int /* audio_io_handle_t */ output);

    void setStreamMute(AudioStreamType stream, boolean muted);



    /*

     * Set AudioTrack port ids volume attribute. This is the new way of controlling volume from

     * AudioPolicyManager to AudioFlinger.

media/libaudioclient/include/media/AudioSystem.h

+0 −7
Original line number Diff line number Diff line
@@ -126,13 +126,6 @@ public: 
    static status_t setMasterMute(bool mute);

    static status_t getMasterMute(bool* mute);



    // set stream volume on specified output

    static status_t setStreamVolume(audio_stream_type_t stream, float value,

                                    bool muted, audio_io_handle_t output);



    // mute/unmute stream

    static status_t setStreamMute(audio_stream_type_t stream, bool mute);



    /**

     * Set volume for given AudioTrack port ids on specified output

     * @param portIds to consider

media/libaudioclient/include/media/IAudioFlinger.h

+0 −15
Original line number Diff line number Diff line
@@ -224,13 +224,6 @@ public: 
    virtual     status_t    setMasterBalance(float balance) = 0;

    virtual     status_t    getMasterBalance(float *balance) const = 0;



    /* set/get stream type state. This will probably be used by

     * the preference panel, mostly.

     */

    virtual     status_t    setStreamVolume(audio_stream_type_t stream, float value,

                                    bool muted, audio_io_handle_t output) = 0;

    virtual     status_t    setStreamMute(audio_stream_type_t stream, bool muted) = 0;



    /**

     * Set volume for given AudioTrack port ids on specified output

     * @param portIds to consider
@@ -433,9 +426,6 @@ public: 
    bool masterMute() const override;

    status_t setMasterBalance(float balance) override;

    status_t getMasterBalance(float* balance) const override;

    status_t setStreamVolume(audio_stream_type_t stream, float value,

                             bool muted, audio_io_handle_t output) override;

    status_t setStreamMute(audio_stream_type_t stream, bool muted) override;

    status_t setPortsVolume(const std::vector<audio_port_handle_t>& portIds, float volume,

            bool muted, audio_io_handle_t output) override;

    status_t setMode(audio_mode_t mode) override;
@@ -559,8 +549,6 @@ public: 
            SET_MASTER_MUTE = media::BnAudioFlingerService::TRANSACTION_setMasterMute,

            MASTER_VOLUME = media::BnAudioFlingerService::TRANSACTION_masterVolume,

            MASTER_MUTE = media::BnAudioFlingerService::TRANSACTION_masterMute,

            SET_STREAM_VOLUME = media::BnAudioFlingerService::TRANSACTION_setStreamVolume,

            SET_STREAM_MUTE = media::BnAudioFlingerService::TRANSACTION_setStreamMute,

            SET_PORTS_VOLUME = media::BnAudioFlingerService::TRANSACTION_setPortsVolume,

            SET_MODE = media::BnAudioFlingerService::TRANSACTION_setMode,

            SET_MIC_MUTE = media::BnAudioFlingerService::TRANSACTION_setMicMute,
@@ -681,9 +669,6 @@ public: 
    Status masterMute(bool* _aidl_return) override;

    Status setMasterBalance(float balance) override;

    Status getMasterBalance(float* _aidl_return) override;

    Status setStreamVolume(media::audio::common::AudioStreamType stream,

                           float value, bool muted, int32_t output) override;

    Status setStreamMute(media::audio::common::AudioStreamType stream, bool muted) override;

    Status setPortsVolume(const std::vector<int32_t>& portIds, float volume, bool muted,

                          int32_t output) override;

    Status setMode(media::audio::common::AudioMode mode) override;