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

Commit e743a47f authored by Paul McLean's avatar Paul McLean
Browse files

Add additional info to AudioPort for enum/selection API. 

Add "device name" member to AudioPort.
Moved unique device ID from DevicePort to AudioPort.
Straighten out confusion between "name" and "address"
Created string constants for Intent "extra" data keys.
Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API.

Change-Id: I1be308e12b09cd0ead9a3e9fbc9c385462299fb5
parent b96efd3c

include/media/AudioSystem.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public: 
    // IAudioPolicyService interface (see AudioPolicyInterface for method descriptions)

    //

    static status_t setDeviceConnectionState(audio_devices_t device, audio_policy_dev_state_t state,

                                                const char *device_address);

                                             const char *device_address, const char *device_name);

    static audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                const char *device_address);

    static status_t setPhoneState(audio_mode_t state);

include/media/IAudioPolicyService.h

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ public: 
    //

    virtual status_t setDeviceConnectionState(audio_devices_t device,

                                              audio_policy_dev_state_t state,

                                              const char *device_address) = 0;

                                              const char *device_address,

                                              const char *device_name) = 0;

    virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                  const char *device_address) = 0;

    virtual status_t setPhoneState(audio_mode_t state) = 0;

media/libmedia/AudioSystem.cpp

+7 −3
Original line number Diff line number Diff line
@@ -590,18 +590,22 @@ const sp<IAudioPolicyService> AudioSystem::get_audio_policy_service() 


status_t AudioSystem::setDeviceConnectionState(audio_devices_t device,

                                               audio_policy_dev_state_t state,

                                               const char *device_address)

                                               const char *device_address,

                                               const char *device_name)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    const char *address = "";

    const char *name = "";



    if (aps == 0) return PERMISSION_DENIED;



    if (device_address != NULL) {

        address = device_address;

    }



    return aps->setDeviceConnectionState(device, state, address);

    if (device_name != NULL) {

        name = device_name;

    }

    return aps->setDeviceConnectionState(device, state, address, name);

}



audio_policy_dev_state_t AudioSystem::getDeviceConnectionState(audio_devices_t device,

media/libmedia/IAudioPolicyService.cpp

+6 −2
Original line number Diff line number Diff line
@@ -84,13 +84,15 @@ public: 
    virtual status_t setDeviceConnectionState(

                                    audio_devices_t device,

                                    audio_policy_dev_state_t state,

                                    const char *device_address)

                                    const char *device_address,

                                    const char *device_name)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());

        data.writeInt32(static_cast <uint32_t>(device));

        data.writeInt32(static_cast <uint32_t>(state));

        data.writeCString(device_address);

        data.writeCString(device_name);

        remote()->transact(SET_DEVICE_CONNECTION_STATE, data, &reply);

        return static_cast <status_t> (reply.readInt32());

    }
@@ -726,9 +728,11 @@ status_t BnAudioPolicyService::onTransact( 
            audio_policy_dev_state_t state =

                    static_cast <audio_policy_dev_state_t>(data.readInt32());

            const char *device_address = data.readCString();

            const char *device_name = data.readCString();

            reply->writeInt32(static_cast<uint32_t> (setDeviceConnectionState(device,

                                                                              state,

                                                                              device_address)));

                                                                              device_address,

                                                                              device_name)));

            return NO_ERROR;

        } break;

services/audiopolicy/AudioPolicyInterface.h

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

    virtual status_t setDeviceConnectionState(audio_devices_t device,

                                              audio_policy_dev_state_t state,

                                          const char *device_address) = 0;

                                              const char *device_address,

                                              const char *device_name) = 0;

    // retrieve a device connection status

    virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                          const char *device_address) = 0;