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

Commit df9e45cc authored by Ricardo Garcia's avatar Ricardo Garcia Committed by Android (Google) Code Review
Browse files

Merge "Fixes related to typo in audio.h"

parents 0f096ea2 1de79cfe

include/media/MicrophoneInfo.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ public: 
    MicrophoneInfo(audio_microphone_characteristic_t& characteristic) {

    MicrophoneInfo(audio_microphone_characteristic_t& characteristic) {

        mDeviceId = String16(&characteristic.device_id[0]);

        mDeviceId = String16(&characteristic.device_id[0]);

        mPortId = characteristic.id;

        mPortId = characteristic.id;

        mType = characteristic.type;

        mType = characteristic.device;

        mAddress = String16(&characteristic.address[0]);

        mAddress = String16(&characteristic.address[0]);

        mDeviceLocation = characteristic.location;

        mDeviceLocation = characteristic.location;

        mDeviceGroup = characteristic.group;

        mDeviceGroup = characteristic.group;

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1984,7 +1984,7 @@ status_t AudioFlinger::getMicrophones(std::vector<media::MicrophoneInfo> *microp 
    for (size_t i = 0; i < fakeNum; i++) {

    for (size_t i = 0; i < fakeNum; i++) {

        struct audio_microphone_characteristic_t characteristics;

        struct audio_microphone_characteristic_t characteristics;

        sprintf(characteristics.device_id, "microphone:%zu", i);

        sprintf(characteristics.device_id, "microphone:%zu", i);

        characteristics.type = fakeTypes[i];

        characteristics.device = fakeTypes[i];

        sprintf(characteristics.address, "");

        sprintf(characteristics.address, "");

        characteristics.location = AUDIO_MICROPHONE_LOCATION_MAINBODY;

        characteristics.location = AUDIO_MICROPHONE_LOCATION_MAINBODY;

        characteristics.group = 0;

        characteristics.group = 0;

services/audioflinger/Threads.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -7051,7 +7051,7 @@ status_t AudioFlinger::RecordThread::getActiveMicrophones( 
    // Fake data

    // Fake data

    struct audio_microphone_characteristic_t characteristic;

    struct audio_microphone_characteristic_t characteristic;

    sprintf(characteristic.device_id, "builtin_mic");

    sprintf(characteristic.device_id, "builtin_mic");

    characteristic.type = AUDIO_DEVICE_IN_BUILTIN_MIC;

    characteristic.device = AUDIO_DEVICE_IN_BUILTIN_MIC;

    sprintf(characteristic.address, "");

    sprintf(characteristic.address, "");

    characteristic.location = AUDIO_MICROPHONE_LOCATION_MAINBODY;

    characteristic.location = AUDIO_MICROPHONE_LOCATION_MAINBODY;

    characteristic.group = 0;

    characteristic.group = 0;