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

Commit e3c9cedc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12283639 from 06cc325f to 24Q4-release 

Change-Id: I54f97cbb3114421d7bd530e94cbcf9d0b2439ae0
parents 2d4a4517 06cc325f

media/audioaidlconversion/AidlConversionNdk.cpp

+2 −1
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ legacy2aidl_record_track_metadata_v7_RecordTrackMetadata(const record_track_meta 


// static

ConversionResult<SourceMetadata>

legacy2aidl_SourceMetadata(const std::vector<playback_track_metadata_v7_t>& legacy) {

legacy2aidl_playback_track_metadata_v7_SourceMetadata(

        const std::vector<playback_track_metadata_v7_t>& legacy) {

    SourceMetadata aidl;

    aidl.tracks = VALUE_OR_RETURN(

            convertContainer<std::vector<PlaybackTrackMetadata>>(

media/audioaidlconversion/include/media/AidlConversionNdk.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ ConversionResult<hardware::audio::common::RecordTrackMetadata> 
legacy2aidl_record_track_metadata_v7_RecordTrackMetadata(const record_track_metadata_v7& legacy);



ConversionResult<hardware::audio::common::SourceMetadata>

legacy2aidl_SourceMetadata(const std::vector<playback_track_metadata_v7_t>& legacy);

legacy2aidl_playback_track_metadata_v7_SourceMetadata(

        const std::vector<playback_track_metadata_v7_t>& legacy);



}  // namespace android

}  // namespace aidl

media/codec2/sfplugin/CCodec.cpp

+13 −10
Original line number Diff line number Diff line
@@ -96,11 +96,14 @@ private: 


public:

    static sp<CCodecWatchdog> getInstance() {

        static sp<CCodecWatchdog> instance(new CCodecWatchdog);

        static std::once_flag flag;

        // Call Init() only once.

        std::call_once(flag, Init, instance);

        static sp<CCodecWatchdog> sInstance = [] {

            sp<CCodecWatchdog> instance = new CCodecWatchdog;

            // the instance should never get destructed

            instance->incStrong((void *)CCodecWatchdog::getInstance);

            instance->init();

            return instance;

        }();

        return sInstance;

    }



    ~CCodecWatchdog() = default;
@@ -146,11 +149,11 @@ protected: 
private:

    CCodecWatchdog() : mLooper(new ALooper) {}



    static void Init(const sp<CCodecWatchdog> &thiz) {

        ALOGV("Init");

        thiz->mLooper->setName("CCodecWatchdog");

        thiz->mLooper->registerHandler(thiz);

        thiz->mLooper->start();

    void init() {

        ALOGV("init");

        mLooper->setName("CCodecWatchdog");

        mLooper->registerHandler(this);

        mLooper->start();

    }



    sp<ALooper> mLooper;

media/libaudioclient/AudioRecord.cpp

+7 −0
Original line number Diff line number Diff line
@@ -256,6 +256,13 @@ status_t AudioRecord::set( 


    mTracker.reset(new RecordingActivityTracker());



    sp<IBinder> binder = defaultServiceManager()->checkService(String16("audio"));

    if (binder != nullptr) {

        // Barrier to ensure runtime permission update propagates to audioflinger

        // Must be client-side

        interface_cast<IAudioManager>(binder)->permissionUpdateBarrier();

    }



    mSelectedDeviceId = selectedDeviceId;

    mSelectedMicDirection = selectedMicDirection;

    mSelectedMicFieldDimension = microphoneFieldDimension;

media/libaudioclient/AudioSystem.cpp

+1 −15
Original line number Diff line number Diff line
@@ -322,18 +322,6 @@ status_t AudioSystem::setStreamMute(audio_stream_type_t stream, bool mute) { 
    return NO_ERROR;

}



status_t AudioSystem::setPortsVolume(

        const std::vector<audio_port_handle_t>& portIds, float volume, audio_io_handle_t output) {

    const sp<IAudioFlinger> af = get_audio_flinger();

    if (af == 0) return PERMISSION_DENIED;

    std::vector<int32_t> portIdsAidl = VALUE_OR_RETURN_STATUS(

            convertContainer<std::vector<int32_t>>(

                    portIds, legacy2aidl_audio_port_handle_t_int32_t));

    int32_t outputAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(output));

    af->setPortsVolume(portIdsAidl, volume, outputAidl);

    return NO_ERROR;

}



status_t AudioSystem::setMode(audio_mode_t mode) {

    if (uint32_t(mode) >= AUDIO_MODE_CNT) return BAD_VALUE;

    const sp<IAudioFlinger> af = get_audio_flinger();
@@ -1093,8 +1081,7 @@ status_t AudioSystem::getOutputForAttr(audio_attributes_t* attr, 
                                       audio_port_handle_t* portId,

                                       std::vector<audio_io_handle_t>* secondaryOutputs,

                                       bool *isSpatialized,

                                       bool *isBitPerfect,

                                       float *volume) {

                                       bool *isBitPerfect) {

    if (attr == nullptr) {

        ALOGE("%s NULL audio attributes", __func__);

        return BAD_VALUE;
@@ -1160,7 +1147,6 @@ status_t AudioSystem::getOutputForAttr(audio_attributes_t* attr, 
    *isBitPerfect = responseAidl.isBitPerfect;

    *attr = VALUE_OR_RETURN_STATUS(

            aidl2legacy_AudioAttributes_audio_attributes_t(responseAidl.attr));

    *volume = responseAidl.volume;



    return OK;

}