commit ad13a121d216975ac0731f7b9ae95ba514380979
author David Duarte <licorne@google.com> Tue Apr 19 08:15:13 2022 +0000
committer David Duarte <licorne@google.com> Tue Apr 19 09:43:19 2022 +0000
tree 31651de89587b0b143a0a82be603737730f691a7
parent 76e556325afddcd5ca3ec5227da6b6cdc3879a59

BlueberryServer: Always play audio track

In some runs of PtsBot cases a2dp is already playing
(`isA2dpPlaying` returns true) when we start. In this
case we don't call AudioTrack#play making the playback
AudioTrack#write calls fails.
We should investigate why a2dp is playing instead but
in the meantime this is a simple and effective fix.

Test: atest pts-bot
Change-Id: I67d81723fb0c468f8629e0bfe4c43adac59a709c

android/blueberry/server/src/com/android/blueberry/A2dp.kt

diff --git a/android/blueberry/server/src/com/android/blueberry/A2dp.kt b/android/blueberry/server/src/com/android/blueberry/A2dp.kt
index ebac7ce..67fde15 100644
--- a/android/blueberry/server/src/com/android/blueberry/A2dp.kt
+++ b/android/blueberry/server/src/com/android/blueberry/A2dp.kt
@@ -168,17 +168,18 @@
         throw Status.UNKNOWN.asException()
       }
 
-      if (!bluetoothA2dp.isA2dpPlaying(device)) {
-        val a2dpPlayingStateFlow =
-          flow
-            .filter { it.getAction() == BluetoothA2dp.ACTION_PLAYING_STATE_CHANGED }
-            .filter {
-              it.getParcelableExtra<BluetoothDevice>(BluetoothDevice.EXTRA_DEVICE).address == address
-            }
-            .map { it.getIntExtra(BluetoothA2dp.EXTRA_STATE, BluetoothAdapter.ERROR) }
+      audioTrack.play()
 
-        audioTrack.play()
-        a2dpPlayingStateFlow.filter { it == BluetoothA2dp.STATE_PLAYING }.first()
+      // If A2dp is not already playing, wait for it
+      if (!bluetoothA2dp.isA2dpPlaying(device)) {
+        flow
+          .filter { it.getAction() == BluetoothA2dp.ACTION_PLAYING_STATE_CHANGED }
+          .filter {
+            it.getParcelableExtra<BluetoothDevice>(BluetoothDevice.EXTRA_DEVICE).address == address
+          }
+          .map { it.getIntExtra(BluetoothA2dp.EXTRA_STATE, BluetoothAdapter.ERROR) }
+          .filter { it == BluetoothA2dp.STATE_PLAYING }
+          .first()
       }
       StartResponse.getDefaultInstance()
     }