From 81f71862ba677f84f6ca68179386ee56d0b2a42b Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 2 Dec 2021 20:38:10 -0800 Subject: SpatializerHelper: fix routing check in canBeSpatialized Fill in AudioDeviceAttributes array from ArrayList directly when calling AudioSystem.canBeSpatialized() method. Bug: 208931004 Test: atest SpatializerTester run on device that supports spatial audio, connected to audio device where spatialization is expected. Change-Id: I41f9058765ee20243459af84cd40d870f26f3226 --- services/core/java/com/android/server/audio/SpatializerHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java index 6a26bea6f8f0..b47ea4f7a4b8 100644 --- a/services/core/java/com/android/server/audio/SpatializerHelper.java +++ b/services/core/java/com/android/server/audio/SpatializerHelper.java @@ -551,9 +551,9 @@ public class SpatializerHelper { logd("canBeSpatialized false due to usage:" + attributes.getUsage()); return false; } - AudioDeviceAttributes[] devices = - // going through adapter to take advantage of routing cache - (AudioDeviceAttributes[]) mASA.getDevicesForAttributes(attributes).toArray(); + AudioDeviceAttributes[] devices = new AudioDeviceAttributes[1]; + // going through adapter to take advantage of routing cache + mASA.getDevicesForAttributes(attributes).toArray(devices); final boolean able = AudioSystem.canBeSpatialized(attributes, format, devices); logd("canBeSpatialized returning " + able); return able; -- cgit v1.2.3-59-g8ed1b