Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11d0950a authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Revert "Fix ringtone play issue via LE devices." 

This reverts commit 0e8f43a2.

Reason for revert: This is unflagged code; we can re-add with a flag at a later date.
Bug: 278835031

Change-Id: I8cf40fbb58a4f3438cdbbbc95f00145974f88cab
parent 0e8f43a2

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

+1 −3
Original line number Diff line number Diff line
@@ -711,9 +711,7 @@ public class BluetoothDeviceManager { 
    }



    public boolean isInbandRingingEnabled() {

        // Get the inband ringing enabled status of expected BT device to route call audio instead

        // of using the address of currently connected device.

        BluetoothDevice activeDevice = mBluetoothRouteManager.getMostRecentlyReportedActiveDevice();

        BluetoothDevice activeDevice = mBluetoothRouteManager.getBluetoothAudioConnectedDevice();

        Log.i(this, "isInbandRingingEnabled: activeDevice: " + activeDevice);

        if (mBluetoothRouteManager.isCachedLeAudioDevice(activeDevice)) {

            if (mBluetoothLeAudioService == null) {

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

+0 −4
Original line number Diff line number Diff line
@@ -652,10 +652,6 @@ public class BluetoothRouteManager extends StateMachine { 
        }

    }



    public BluetoothDevice getMostRecentlyReportedActiveDevice() {

        return mMostRecentlyReportedActiveDevice;

    }



    public boolean hasBtActiveDevice() {

        return mLeAudioActiveDeviceCache != null ||

                mHearingAidActiveDeviceCache != null ||

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

+8 −3
Original line number Diff line number Diff line
@@ -755,15 +755,20 @@ public class BluetoothDeviceManagerTest extends TelecomTestCase { 
        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));

        receiverUnderTest.onReceive(mContext,

                buildConnectionActionIntent(BluetoothHeadset.STATE_CONNECTED, device2,

                        BluetoothDeviceManager.DEVICE_TYPE_HEADSET));

        receiverUnderTest.onReceive(mContext,

                buildConnectionActionIntent(BluetoothHeadset.STATE_CONNECTED, device3,

                        BluetoothDeviceManager.DEVICE_TYPE_LE_AUDIO));

        leAudioCallbacksTest.getValue().onGroupNodeAdded(device3, 1);

        when(mBluetoothLeAudio.getConnectedGroupLeadDevice(1)).thenReturn(device3);

        when(mRouteManager.getBluetoothAudioConnectedDevice()).thenReturn(device3);

        when(mRouteManager.isCachedLeAudioDevice(eq(device3))).thenReturn(true);

        when(mBluetoothLeAudio.getConnectedGroupLeadDevice(1)).thenReturn(device3);

        when(mRouteManager.getMostRecentlyReportedActiveDevice()).thenReturn(device3);

        assertEquals(1, mBluetoothDeviceManager.getNumConnectedDevices());

        assertEquals(3, mBluetoothDeviceManager.getNumConnectedDevices());

        assertTrue(mBluetoothDeviceManager.isInbandRingingEnabled());

    }