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

Commit 5602660e authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: optimize Bluetooth device switch" into main

parents 922d45af 70997784

media/libaudioclient/AudioSystem.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ void AudioSystem::onNewAudioModulesAvailable() { 


status_t AudioSystem::setDeviceConnectionState(audio_policy_dev_state_t state,

                                               const android::media::audio::common::AudioPort& port,

                                               audio_format_t encodedFormat) {

                                               audio_format_t encodedFormat, bool deviceSwitch) {

    const sp<IAudioPolicyService> aps = get_audio_policy_service();



    if (aps == nullptr) return AudioPolicyServiceTraits::getError();
@@ -1188,7 +1188,8 @@ status_t AudioSystem::setDeviceConnectionState(audio_policy_dev_state_t state, 
                            legacy2aidl_audio_policy_dev_state_t_AudioPolicyDeviceState(state)),

                    port,

                    VALUE_OR_RETURN_STATUS(

                            legacy2aidl_audio_format_t_AudioFormatDescription(encodedFormat))));

                            legacy2aidl_audio_format_t_AudioFormatDescription(encodedFormat)),

                    deviceSwitch));

}



audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t device,

media/libaudioclient/aidl/android/media/IAudioPolicyService.aidl

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ interface IAudioPolicyService { 


    void setDeviceConnectionState(in AudioPolicyDeviceState state,

                                  in android.media.audio.common.AudioPort port,

                                  in AudioFormatDescription encodedFormat);

                                  in AudioFormatDescription encodedFormat,

                                  boolean deviceSwitch);



    AudioPolicyDeviceState getDeviceConnectionState(in AudioDevice device);

media/libaudioclient/include/media/AudioSystem.h

+2 −1
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ public: 
    static void onNewAudioModulesAvailable();

    static status_t setDeviceConnectionState(audio_policy_dev_state_t state,

                                             const android::media::audio::common::AudioPort& port,

                                             audio_format_t encodedFormat);

                                             audio_format_t encodedFormat,

                                             bool deviceSwitch);

    static audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                const char *device_address);

    static status_t handleDeviceConfigChange(audio_devices_t device,

media/libaudioclient/tests/audiosystem_tests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -698,13 +698,13 @@ TEST_F(AudioSystemTest, SetDeviceConnectedState) { 
        // !!! Instead of the default format, use each format from 'ext.encodedFormats'

        // !!! if they are not empty

        status = AudioSystem::setDeviceConnectionState(AUDIO_POLICY_DEVICE_STATE_AVAILABLE,

                                                       aidlPort, AUDIO_FORMAT_DEFAULT);

                                                       aidlPort, AUDIO_FORMAT_DEFAULT, false);

        EXPECT_EQ(OK, status);

        if (status != OK) continue;

        deviceState = AudioSystem::getDeviceConnectionState(type, address);

        EXPECT_EQ(AUDIO_POLICY_DEVICE_STATE_AVAILABLE, deviceState);

        status = AudioSystem::setDeviceConnectionState(AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE,

                                                       aidlPort, AUDIO_FORMAT_DEFAULT);

                                                       aidlPort, AUDIO_FORMAT_DEFAULT, false);

        EXPECT_EQ(OK, status);

        deviceState = AudioSystem::getDeviceConnectionState(type, address);

        EXPECT_EQ(AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE, deviceState);

services/audiopolicy/AudioPolicyInterface.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public: 
    // indicate a change in device connection status

    virtual status_t setDeviceConnectionState(audio_policy_dev_state_t state,

                                              const android::media::audio::common::AudioPort& port,

                                              audio_format_t encodedFormat) = 0;

                                              audio_format_t encodedFormat, bool deviceSwitch) = 0;

    // retrieve a device connection status

    virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                              const char *device_address) = 0;