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

Commit 4d80237c authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ShortAudioDescriptors" 

* changes:
  Adapt AudioPolicy unit tests
  Transport AudioPort to HAL
parents 6edb019e b0775a78

media/libaudioclient/AudioSystem.cpp

+3 −18
Original line number Diff line number Diff line
@@ -834,33 +834,18 @@ void AudioSystem::onNewAudioModulesAvailable() { 
    aps->onNewAudioModulesAvailable();

}



status_t AudioSystem::setDeviceConnectionState(audio_devices_t device,

                                               audio_policy_dev_state_t state,

                                               const char* device_address,

                                               const char* device_name,

status_t AudioSystem::setDeviceConnectionState(audio_policy_dev_state_t state,

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

                                               audio_format_t encodedFormat) {

    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;

    }

    if (device_name != NULL) {

        name = device_name;

    }



    AudioDevice deviceAidl = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_device_AudioDevice(device, address));



    return statusTFromBinderStatus(

            aps->setDeviceConnectionState(

                    deviceAidl,

                    VALUE_OR_RETURN_STATUS(

                            legacy2aidl_audio_policy_dev_state_t_AudioPolicyDeviceState(state)),

                    name,

                    port,

                    VALUE_OR_RETURN_STATUS(

                            legacy2aidl_audio_format_t_AudioFormatDescription(encodedFormat))));

}

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

+3 −3
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.media.audio.common.AudioFormatDescription; 
import android.media.audio.common.AudioMode;

import android.media.audio.common.AudioProfile;

import android.media.audio.common.AudioOffloadInfo;

import android.media.audio.common.AudioPort;

import android.media.audio.common.AudioSource;

import android.media.audio.common.AudioStreamType;

import android.media.audio.common.AudioUsage;
@@ -64,9 +65,8 @@ import android.media.audio.common.Int; 
interface IAudioPolicyService {

    oneway void onNewAudioModulesAvailable();



    void setDeviceConnectionState(in AudioDevice device,

                                  in AudioPolicyDeviceState state,

                                  @utf8InCpp String deviceName,

    void setDeviceConnectionState(in AudioPolicyDeviceState state,

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

                                  in AudioFormatDescription encodedFormat);



    AudioPolicyDeviceState getDeviceConnectionState(in AudioDevice device);

media/libaudioclient/include/media/AudioSystem.h

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <android/media/ISpatializer.h>

#include <android/media/audio/common/AudioMMapPolicyInfo.h>

#include <android/media/audio/common/AudioMMapPolicyType.h>

#include <android/media/audio/common/AudioPort.h>

#include <media/AidlConversionUtil.h>

#include <media/AudioContainers.h>

#include <media/AudioDeviceTypeAddr.h>
@@ -263,8 +264,8 @@ public: 
    // IAudioPolicyService interface (see AudioPolicyInterface for method descriptions)

    //

    static void onNewAudioModulesAvailable();

    static status_t setDeviceConnectionState(audio_devices_t device, audio_policy_dev_state_t state,

                                             const char *device_address, const char *device_name,

    static status_t setDeviceConnectionState(audio_policy_dev_state_t state,

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

                                             audio_format_t encodedFormat);

    static audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

                                                                const char *device_address);

services/audiopolicy/AudioPolicyInterface.h

+2 −4
Original line number Diff line number Diff line
@@ -105,10 +105,8 @@ public: 
    virtual void onNewAudioModulesAvailable() = 0;



    // 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,

                                              const char *device_name,

    virtual status_t setDeviceConnectionState(audio_policy_dev_state_t state,

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

                                              audio_format_t encodedFormat) = 0;

    // retrieve a device connection status

    virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device,

services/audiopolicy/managerdefault/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ cc_library_shared { 
        "libaudiopolicyenginedefault",

        "framework-permission-aidl-cpp",

        "libaudioclient_aidl_conversion",

        "android.media.audio.common.types-V1-cpp",

        "audioclient-types-aidl-cpp",

    ],



    header_libs: [