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

Commit 54b48c31 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev

parents 034c20ea a13cde98

media/libmedia/IAudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ status_t BnAudioFlinger::onTransact( 
            CHECK_INTERFACE(IAudioFlinger, data, reply);

            struct audio_patch patch;

            data.read(&patch, sizeof(struct audio_patch));

            audio_patch_handle_t handle = {};

            audio_patch_handle_t handle = AUDIO_PATCH_HANDLE_NONE;

            if (data.read(&handle, sizeof(audio_patch_handle_t)) != NO_ERROR) {

                ALOGE("b/23905951");

            }

media/libmedia/IAudioPolicyService.cpp

+5 −5
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ status_t BnAudioPolicyService::onTransact( 
            audio_channel_mask_t channelMask = data.readInt32();

            audio_input_flags_t flags = (audio_input_flags_t) data.readInt32();

            audio_port_handle_t selectedDeviceId = (audio_port_handle_t) data.readInt32();

            audio_io_handle_t input = {};

            audio_io_handle_t input = AUDIO_IO_HANDLE_NONE;

            status_t status = getInputForAttr(&attr, &input, session, uid,

                                              samplingRate, format, channelMask,

                                              flags, selectedDeviceId);
@@ -1197,7 +1197,7 @@ status_t BnAudioPolicyService::onTransact( 
            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            struct audio_patch patch;

            data.read(&patch, sizeof(struct audio_patch));

            audio_patch_handle_t handle = {};

            audio_patch_handle_t handle = AUDIO_PATCH_HANDLE_NONE;

            if (data.read(&handle, sizeof(audio_patch_handle_t)) != NO_ERROR) {

                ALOGE("b/23912202");

            }
@@ -1275,9 +1275,9 @@ status_t BnAudioPolicyService::onTransact( 
            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            sp<IAudioPolicyServiceClient> client = interface_cast<IAudioPolicyServiceClient>(

                    data.readStrongBinder());

            audio_session_t session = {};

            audio_io_handle_t ioHandle = {};

            audio_devices_t device = {};

            audio_session_t session = AUDIO_SESSION_NONE;

            audio_io_handle_t ioHandle = AUDIO_IO_HANDLE_NONE;

            audio_devices_t device = AUDIO_DEVICE_NONE;

            status_t status = acquireSoundTriggerSession(&session, &ioHandle, &device);

            reply->writeInt32(status);

            if (status == NO_ERROR) {

services/audioflinger/AudioFlinger.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1540,10 +1540,10 @@ Exit: 
audio_module_handle_t AudioFlinger::loadHwModule(const char *name)

{

    if (name == NULL) {

        return 0;

        return AUDIO_MODULE_HANDLE_NONE;

    }

    if (!settingsAllowed()) {

        return 0;

        return AUDIO_MODULE_HANDLE_NONE;

    }

    Mutex::Autolock _l(mLock);

    return loadHwModule_l(name);
@@ -1564,7 +1564,7 @@ audio_module_handle_t AudioFlinger::loadHwModule_l(const char *name) 
    int rc = load_audio_interface(name, &dev);

    if (rc) {

        ALOGE("loadHwModule() error %d loading module %s", rc, name);

        return 0;

        return AUDIO_MODULE_HANDLE_NONE;

    }



    mHardwareStatus = AUDIO_HW_INIT;
@@ -1572,7 +1572,7 @@ audio_module_handle_t AudioFlinger::loadHwModule_l(const char *name) 
    mHardwareStatus = AUDIO_HW_IDLE;

    if (rc) {

        ALOGE("loadHwModule() init check error %d for module %s", rc, name);

        return 0;

        return AUDIO_MODULE_HANDLE_NONE;

    }



    // Check and cache this HAL's level of support for master mute and master
@@ -1619,7 +1619,7 @@ audio_module_handle_t AudioFlinger::loadHwModule_l(const char *name) 
        mHardwareStatus = AUDIO_HW_IDLE;

    }



    audio_module_handle_t handle = nextUniqueId(AUDIO_UNIQUE_ID_USE_MODULE);

    audio_module_handle_t handle = (audio_module_handle_t) nextUniqueId(AUDIO_UNIQUE_ID_USE_MODULE);

    mAudioHwDevs.add(handle, new AudioHwDevice(handle, name, dev, flags));



    ALOGI("loadHwModule() Loaded %s audio interface from %s (%s) handle %d",

services/audioflinger/PatchPanel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ status_t AudioFlinger::PatchPanel::createAudioPatch(const struct audio_patch *pa 
exit:

    ALOGV("createAudioPatch() status %d", status);

    if (status == NO_ERROR) {

        *handle = audioflinger->nextUniqueId(AUDIO_UNIQUE_ID_USE_PATCH);

        *handle = (audio_patch_handle_t) audioflinger->nextUniqueId(AUDIO_UNIQUE_ID_USE_PATCH);

        newPatch->mHandle = *handle;

        newPatch->mHalHandle = halHandle;

        mPatches.add(newPatch);

services/audiopolicy/common/managerdefinitions/include/AudioSourceDescriptor.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public: 
};



class AudioSourceCollection :

        public DefaultKeyedVector< audio_patch_handle_t, sp<AudioSourceDescriptor> >

        public DefaultKeyedVector< audio_io_handle_t, sp<AudioSourceDescriptor> >

{

public:

    status_t dump(int fd) const;