Merge "audio: remove flag com.android.media.audio.dsa_over_bt_le_audio" into main (cd602c84) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/SpatializerHelper.java

+24 −45

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@ import static android.media.AudioManager.AUDIO_DEVICE_CATEGORY_UNKNOWN;
		import static android.media.AudioSystem.isBluetoothDevice;
		import static android.media.AudioSystem.isBluetoothLeDevice;

		import static com.android.media.audio.Flags.dsaOverBtLeAudio;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Context;
		@@ -1685,7 +1683,7 @@ public class SpatializerHelper {
		for (String address : deviceAddresses) {
		UUID routingDeviceUuid = UuidUtils.uuidFromAudioDeviceAttributes(
		new AudioDeviceAttributes(currentDevice.getInternalType(), address));
		if (dsaOverBtLeAudio()) {

		for (Sensor sensor : sensors) {
		final UUID uuid = sensor.getUuid();
		if (uuid.equals(routingDeviceUuid)) {
		@@ -1718,25 +1716,6 @@ public class SpatializerHelper {
		htSensor = null;
		}
		}
		} else {
		for (Sensor sensor : sensors) {
		final UUID uuid = sensor.getUuid();
		if (uuid.equals(routingDeviceUuid)) {
		htSensor = sensor;
		if (!setHasHeadTracker(currentDevice)) {
		htSensor = null;
		}
		break;
		}
		if (uuid.equals(UuidUtils.STANDALONE_UUID)) {
		htSensor = sensor;
		// we do not break, perhaps we find a head tracker on device.
		}
		}
		if (htSensor != null) {
		break;
		}
		}
		}
		return htSensor != null ? htSensor.getHandle() : -1;
		}