Fixes related to typo in audio.h
Bug: 64038649
Test: Manual Testing and CTS tests.
Change-Id: Id2650638f789d85116d780d87b19debd2a13a737
diff --git a/include/media/MicrophoneInfo.h b/include/media/MicrophoneInfo.h
index b0199d4..2287aca 100644
--- a/include/media/MicrophoneInfo.h
+++ b/include/media/MicrophoneInfo.h
@@ -42,7 +42,7 @@
MicrophoneInfo(audio_microphone_characteristic_t& characteristic) {
mDeviceId = String16(&characteristic.device_id[0]);
mPortId = characteristic.id;
- mType = characteristic.type;
+ mType = characteristic.device;
mAddress = String16(&characteristic.address[0]);
mDeviceLocation = characteristic.location;
mDeviceGroup = characteristic.group;
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 592273e..e7140c2 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1984,7 +1984,7 @@
for (size_t i = 0; i < fakeNum; i++) {
struct audio_microphone_characteristic_t characteristics;
sprintf(characteristics.device_id, "microphone:%zu", i);
- characteristics.type = fakeTypes[i];
+ characteristics.device = fakeTypes[i];
sprintf(characteristics.address, "");
characteristics.location = AUDIO_MICROPHONE_LOCATION_MAINBODY;
characteristics.group = 0;
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 14d7e2e..24d862f 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -7051,7 +7051,7 @@
// Fake data
struct audio_microphone_characteristic_t characteristic;
sprintf(characteristic.device_id, "builtin_mic");
- characteristic.type = AUDIO_DEVICE_IN_BUILTIN_MIC;
+ characteristic.device = AUDIO_DEVICE_IN_BUILTIN_MIC;
sprintf(characteristic.address, "");
characteristic.location = AUDIO_MICROPHONE_LOCATION_MAINBODY;
characteristic.group = 0;