commit 48c2a72651bb464eeed39ea7f7e95ac0c3874d6e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 16 06:58:16 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 16 06:58:16 2022 +0000
tree 2970b94ab86d55a36874b0237246d060564ea4fb
parent 00903a9f0130fd6363b0ffca2bdda07e2c68435e
parent bbdcdec933be8052ae13c9650337f9e9ba3ff3c2

Merge "BtAudio: Handle dataInterval in LeAudioSW VTS" am: 3a6d0f8d75 am: bbdcdec933

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1986306

Change-Id: I482c63631a6d5b42f72eaabc5caf6c68d403055f

bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp

diff --git a/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp b/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp
index 307403b..38a6b0d 100644
--- a/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp
+++ b/bluetooth/audio/aidl/vts/VtsHalBluetoothAudioTargetTest.cpp
@@ -983,7 +983,8 @@
               .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 @@
               .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 @@
               .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);