commit 219bc5b52c86ab72a2b94ed18ebdb8da786feb01
author Łukasz Rymanowski <rlukasz@google.com> Fri Jan 13 11:43:48 2023 +0000
committer Łukasz Rymanowski <rlukasz@google.com> Wed Feb 01 10:57:33 2023 +0000
tree 1e7dde7c742677358fc428e4fcbd8ee5a038e0b2
parent 7a6ea1d43426c31673dc1c3637e4859b5ef802da

LeAudio: Use new isInbandRingtoneEnabled API

Bug: 242685105
Test: atest BluetoothDeviceManagerTest
Tag: #feature
Change-Id: I079ba3191ed1214abacc7abb96f1fa2cb2081ac2

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

diff --git a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
index 6a701da..1b0cd7e 100644
--- a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
+++ b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
@@ -641,7 +641,12 @@
         BluetoothDevice activeDevice = mBluetoothRouteManager.getBluetoothAudioConnectedDevice();
         Log.i(this, "isInbandRingingEnabled: activeDevice: " + activeDevice);
         if (mBluetoothRouteManager.isCachedLeAudioDevice(activeDevice)) {
-            return true;
+            if (mBluetoothLeAudioService == null) {
+                Log.i(this, "isInbandRingingEnabled: no leaudio service available.");
+                return false;
+            }
+            int groupId = mBluetoothLeAudioService.getGroupId(activeDevice);
+            return mBluetoothLeAudioService.isInbandRingtoneEnabled(groupId);
         } else {
             if (mBluetoothHeadset == null) {
                 Log.i(this, "isInbandRingingEnabled: no headset service available.");

tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java

diff --git a/tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java b/tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
index e730274..ad6d559 100644
--- a/tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
@@ -518,6 +518,8 @@
     @Test
     public void testInBandRingingEnabledForLeDevice() {
         when(mBluetoothHeadset.isInbandRingingEnabled()).thenReturn(false);
+        when(mBluetoothLeAudio.isInbandRingtoneEnabled(1)).thenReturn(true);
+        when(mBluetoothLeAudio.getGroupId(eq(device3))).thenReturn(1);
         receiverUnderTest.onReceive(mContext,
                 buildConnectionActionIntent(BluetoothHeadset.STATE_CONNECTED, device1,
                         BluetoothDeviceManager.DEVICE_TYPE_HEADSET));