From b0f3d97f1a73574bbb9ba999747eb288e75fcfff Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 27 Jan 2023 16:08:29 -0800 Subject: [PATCH] audio: Match framework expectations for mic addresses The framework expects that "built-in mic" has address "bottom", and the "buitl-in back mic" has address "back". This logic will be incorporated into the XML to AIDL serializer later. Bug: 205884982 Test: enable AIDL audio HAL on CF and run `atest CtsMediaAudioTestCases` Change-Id: I5052b312b673e18e3148f917487b1f90a1e04ba6 --- audio/aidl/default/Configuration.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/audio/aidl/default/Configuration.cpp b/audio/aidl/default/Configuration.cpp index 7b2deb7431..854c7f372c 100644 --- a/audio/aidl/default/Configuration.cpp +++ b/audio/aidl/default/Configuration.cpp @@ -76,6 +76,11 @@ static AudioPortExt createDeviceExt(AudioDeviceType devType, int32_t flags, std::string connection = "") { AudioPortDeviceExt deviceExt; deviceExt.device.type.type = devType; + if (devType == AudioDeviceType::IN_MICROPHONE && connection.empty()) { + deviceExt.device.address = "bottom"; + } else if (devType == AudioDeviceType::IN_MICROPHONE_BACK && connection.empty()) { + deviceExt.device.address = "back"; + } deviceExt.device.type.connection = std::move(connection); deviceExt.flags = flags; return AudioPortExt::make(deviceExt);