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

Commit 24e063bd authored by weichinweng's avatar weichinweng Committed by Stanley Tng
Browse files

Hearing Aid Service: Don't sent suppress noisy intent 

1) When the active device is change to other device, don't send suppress
noisy intent
2) When the active device is change to null, will check the connection
state, if it is disconnected will sent intent.

Bug: 112279820
Test: Build Pass, BT off/on when play A2DP, Switch active device
Change-Id: I80cbf8180b68c671657fd3b9375ee78ea15b47eb
Merged-In: I80cbf8180b68c671657fd3b9375ee78ea15b47eb
Merged-In: I645b7999c2921974dd3e0c31a832e40fe203ba0c
parent 28168336

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+11 −6
Original line number Diff line number Diff line
@@ -627,19 +627,24 @@ public class HearingAidService extends ProfileService { 
            if (DBG) {

                Log.d(TAG, "Set Hearing Aid audio to disconnected");

            }

            mAudioManager.setHearingAidDeviceConnectionState(mPreviousAudioDevice,

                    BluetoothProfile.STATE_DISCONNECTED);

            boolean suppressNoisyIntent =

                    (getConnectionState(mPreviousAudioDevice) == BluetoothProfile.STATE_CONNECTED);

            mAudioManager.setBluetoothHearingAidDeviceConnectionState(

                    mPreviousAudioDevice, BluetoothProfile.STATE_DISCONNECTED,

                    suppressNoisyIntent, 0);

            mPreviousAudioDevice = null;

        } else {

            if (DBG) {

                Log.d(TAG, "Set Hearing Aid audio to connected");

            }

            if (mPreviousAudioDevice != null) {

                mAudioManager.setHearingAidDeviceConnectionState(mPreviousAudioDevice,

                        BluetoothProfile.STATE_DISCONNECTED);

                mAudioManager.setBluetoothHearingAidDeviceConnectionState(

                        mPreviousAudioDevice, BluetoothProfile.STATE_DISCONNECTED,

                        true, 0);

            }

            mAudioManager.setHearingAidDeviceConnectionState(device,

                    BluetoothProfile.STATE_CONNECTED);

            mAudioManager.setBluetoothHearingAidDeviceConnectionState(

                    device, BluetoothProfile.STATE_CONNECTED,

                    true, 0);

            mPreviousAudioDevice = device;

        }

    }

android/app/tests/unit/src/com/android/bluetooth/hearingaid/HearingAidServiceTest.java

+6 −4
Original line number Diff line number Diff line
@@ -501,8 +501,9 @@ public class HearingAidServiceTest { 
        Assert.assertTrue(mService.getConnectedDevices().contains(mRightDevice));



        // Verify the audio is routed to Hearing Aid Profile

        verify(mAudioManager).setHearingAidDeviceConnectionState(any(BluetoothDevice.class),

                eq(BluetoothProfile.STATE_CONNECTED));

        verify(mAudioManager).setBluetoothHearingAidDeviceConnectionState(

                any(BluetoothDevice.class), eq(BluetoothProfile.STATE_CONNECTED),

                eq(true), eq(0));



        // Send a disconnect request

        Assert.assertTrue("Disconnect failed", mService.disconnect(mLeftDevice));
@@ -549,8 +550,9 @@ public class HearingAidServiceTest { 
        Assert.assertFalse(mService.getConnectedDevices().contains(mRightDevice));



        // Verify the audio is not routed to Hearing Aid Profile

        verify(mAudioManager).setHearingAidDeviceConnectionState(any(BluetoothDevice.class),

                eq(BluetoothProfile.STATE_DISCONNECTED));

        verify(mAudioManager).setBluetoothHearingAidDeviceConnectionState(

                any(BluetoothDevice.class), eq(BluetoothProfile.STATE_DISCONNECTED),

                eq(false), eq(0));

    }



    /**