From 5392e89fc7a7a656ab919565988a57f83dc6c16f Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Wed, 17 Aug 2022 17:37:43 -0700 Subject: SpatializerHelper: Fix device name translation In the spatializer metrics, bt_a2dp was aliasing to (wired) headphone. Test: adb shell dumpsys media.metrics Bug: 233773341 Merged-In: Ic6cbeb8bfadbe961eea04517a404b49db9eb2b34 Change-Id: Ic6cbeb8bfadbe961eea04517a404b49db9eb2b34 (cherry picked from commit 5b3731851fe0005a9bb6e9d6dacf3c82954ef182) --- services/core/java/com/android/server/audio/SpatializerHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java index 8356134bc63b..aedbe4eb945a 100644 --- a/services/core/java/com/android/server/audio/SpatializerHelper.java +++ b/services/core/java/com/android/server/audio/SpatializerHelper.java @@ -571,7 +571,9 @@ public class SpatializerHelper { // There may be different devices with the same device type (aliasing). // We always send the full device state info on each change. private void logDeviceState(SADeviceState deviceState, String event) { - final String deviceName = AudioSystem.getDeviceName(deviceState.mDeviceType); + final int deviceType = AudioDeviceInfo.convertDeviceTypeToInternalDevice( + deviceState.mDeviceType); + final String deviceName = AudioSystem.getDeviceName(deviceType); new MediaMetrics.Item(METRICS_DEVICE_PREFIX + deviceName) .set(MediaMetrics.Property.ADDRESS, deviceState.mDeviceAddress) .set(MediaMetrics.Property.ENABLED, deviceState.mEnabled ? "true" : "false") -- cgit v1.2.3-59-g8ed1b