Merge "SpatializerHelper: Fix device name translation" am: eac4885894 am: e83594d4af

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2212408

Change-Id: I30716db2219928a2ecadb9ca8656c55f7f344a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Hung
2022-09-09 18:17:25 +00:00
committed by Automerger Merge Worker

View File

@@ -582,7 +582,9 @@ public class SpatializerHelper {
// There may be different devices with the same device type (aliasing). // There may be different devices with the same device type (aliasing).
// We always send the full device state info on each change. // We always send the full device state info on each change.
private void logDeviceState(SADeviceState deviceState, String event) { 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) new MediaMetrics.Item(METRICS_DEVICE_PREFIX + deviceName)
.set(MediaMetrics.Property.ADDRESS, deviceState.mDeviceAddress) .set(MediaMetrics.Property.ADDRESS, deviceState.mDeviceAddress)
.set(MediaMetrics.Property.ENABLED, deviceState.mEnabled ? "true" : "false") .set(MediaMetrics.Property.ENABLED, deviceState.mEnabled ? "true" : "false")