summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andy Hung <hunga@google.com> 2022-08-17 17:37:43 -0700
committer Andy Hung <hunga@google.com> 2022-09-08 15:40:09 -0700
commit88c2bb83ef38e43fa42cd1cea167c25deb849fc4 (patch)
treea666c17586af3cfd6f9fcf37ec768946b4e19697
parent4fca0605bd37d338c7498c529d1bf0e5c96eac8b (diff)
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)
-rw-r--r--services/core/java/com/android/server/audio/SpatializerHelper.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java
index 57a6fdf6202c..8e8fd05bf72e 100644
--- a/services/core/java/com/android/server/audio/SpatializerHelper.java
+++ b/services/core/java/com/android/server/audio/SpatializerHelper.java
@@ -582,7 +582,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")