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

Commit 0d4f84f3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Plumb APM configuration retrieval from HAL" am: a357d555 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2576599



Change-Id: Iba6f49b80c349e2c43624c035c28b5c79fdcd4cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fac82021 a357d555

media/audioaidlconversion/AidlConversionNdkCpp.cpp

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ GENERATE_CONVERTERS(android::media::audio::common, AudioFormatDescription); 
GENERATE_CONVERTERS(android::media::audio::common, AudioHalEngineConfig);

GENERATE_CONVERTERS(android::media::audio::common, AudioMMapPolicyInfo);

GENERATE_ENUM_CONVERTERS(android::media::audio::common, AudioMMapPolicyType);

GENERATE_ENUM_CONVERTERS(android::media::audio::common, AudioMode);

GENERATE_CONVERTERS(android::media::audio::common, AudioPort);



}  // namespace android

media/audioaidlconversion/include/media/AidlConversionNdkCpp.h

+3 −0
Original line number Diff line number Diff line
@@ -23,11 +23,13 @@ 
#include <aidl/android/media/audio/common/AudioHalEngineConfig.h>

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

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

#include <aidl/android/media/audio/common/AudioMode.h>

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

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

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

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

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

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

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

#include <media/AidlConversionUtil.h>
@@ -43,6 +45,7 @@ DECLARE_CONVERTERS(android::media::audio::common, AudioFormatDescription); 
DECLARE_CONVERTERS(android::media::audio::common, AudioHalEngineConfig);

DECLARE_CONVERTERS(android::media::audio::common, AudioMMapPolicyInfo);

DECLARE_CONVERTERS(android::media::audio::common, AudioMMapPolicyType);

DECLARE_CONVERTERS(android::media::audio::common, AudioMode);

DECLARE_CONVERTERS(android::media::audio::common, AudioPort);



#undef DECLARE_CONVERTERS

media/libaudioclient/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -287,9 +287,11 @@ aidl_interface { 
        "aidl/android/media/AudioFlag.aidl",

        "aidl/android/media/AudioGainSys.aidl",

        "aidl/android/media/AudioHalVersion.aidl",

        "aidl/android/media/AudioHwModule.aidl",

        "aidl/android/media/AudioIoConfigEvent.aidl",

        "aidl/android/media/AudioIoDescriptor.aidl",

        "aidl/android/media/AudioPatchFw.aidl",

        "aidl/android/media/AudioPolicyConfig.aidl",

        "aidl/android/media/AudioPortFw.aidl",

        "aidl/android/media/AudioPortSys.aidl",

        "aidl/android/media/AudioPortConfigFw.aidl",

media/libaudioclient/AudioSystem.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2480,6 +2480,14 @@ status_t AudioSystem::supportsBluetoothVariableLatency( 
    return af->supportsBluetoothVariableLatency(support);

}



status_t AudioSystem::getAudioPolicyConfig(media::AudioPolicyConfig *config) {

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();

    if (af == nullptr) {

        return PERMISSION_DENIED;

    }

    return af->getAudioPolicyConfig(config);

}



class CaptureStateListenerImpl : public media::BnCaptureStateListener,

                                 public IBinder::DeathRecipient {

public:

media/libaudioclient/IAudioFlinger.cpp

+14 −0
Original line number Diff line number Diff line
@@ -866,6 +866,16 @@ status_t AudioFlingerClientAdapter::supportsBluetoothVariableLatency(bool* suppo 
    return NO_ERROR;

}



status_t AudioFlingerClientAdapter::getAudioPolicyConfig(media::AudioPolicyConfig *config) {

    if (config == nullptr) {

        return BAD_VALUE;

    }



    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mDelegate->getAudioPolicyConfig(config)));



    return NO_ERROR;

}



////////////////////////////////////////////////////////////////////////////////////////////////////

// AudioFlingerServerAdapter

AudioFlingerServerAdapter::AudioFlingerServerAdapter(
@@ -1399,4 +1409,8 @@ Status AudioFlingerServerAdapter::supportsBluetoothVariableLatency(bool *support 
    return Status::fromStatusT(mDelegate->supportsBluetoothVariableLatency(support));

}



Status AudioFlingerServerAdapter::getAudioPolicyConfig(media::AudioPolicyConfig* _aidl_return) {

    return Status::fromStatusT(mDelegate->getAudioPolicyConfig(_aidl_return));

}



} // namespace android