From 8a1be763b6ee3d590b1eaa10a02274557e3b9f33 Mon Sep 17 00:00:00 2001
From: Josh Wu <joshwu@google.com>
Date: Tue, 15 Feb 2022 09:37:29 -0800
Subject: [PATCH] BtAudio: Handle dataInterval in LeAudioSW VTS

Test: atest VtsHalBluetoothAudioTargetTest
Bug: 203490261
Change-Id: I447d0e74b6b1af2959cc133437e0dd7216814369
---
 .../audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp b/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp
index 307403b451..38a6b0d6a6 100644
--- a/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp
+++ b/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp
@@ -983,7 +983,8 @@ TEST_P(BluetoothAudioProviderLeAudioOutputSoftwareAidl,
               .channelMode = channel_mode,
               .dataIntervalUs = data_interval_us,
           };
-          bool is_codec_config_valid = IsPcmConfigSupported(pcm_config);
+          bool is_codec_config_valid =
+              IsPcmConfigSupported(pcm_config) && pcm_config.dataIntervalUs > 0;
           DataMQDesc mq_desc;
           auto aidl_retval = audio_provider_->startSession(
               audio_port_, AudioConfiguration(pcm_config), &mq_desc);
@@ -1054,7 +1055,8 @@ TEST_P(BluetoothAudioProviderLeAudioInputSoftwareAidl,
               .channelMode = channel_mode,
               .dataIntervalUs = data_interval_us,
           };
-          bool is_codec_config_valid = IsPcmConfigSupported(pcm_config);
+          bool is_codec_config_valid =
+              IsPcmConfigSupported(pcm_config) && pcm_config.dataIntervalUs > 0;
           DataMQDesc mq_desc;
           auto aidl_retval = audio_provider_->startSession(
               audio_port_, AudioConfiguration(pcm_config), &mq_desc);
@@ -1395,7 +1397,8 @@ TEST_P(BluetoothAudioProviderLeAudioBroadcastSoftwareAidl,
               .channelMode = channel_mode,
               .dataIntervalUs = data_interval_us,
           };
-          bool is_codec_config_valid = IsPcmConfigSupported(pcm_config);
+          bool is_codec_config_valid =
+              IsPcmConfigSupported(pcm_config) && pcm_config.dataIntervalUs > 0;
           DataMQDesc mq_desc;
           auto aidl_retval = audio_provider_->startSession(
               audio_port_, AudioConfiguration(pcm_config), &mq_desc);