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

Commit 1b7e0471 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Fix Stub override when argument is already defined" am: b0ef194e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2277487



Change-Id: I2cbbf9804149a9704d2ed4e5b33ad97fb16d34df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ee22cf4 b0ef194e

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetServiceAndStateMachineTest.java

+2 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ public class HeadsetServiceAndStateMachineTest { 
        // Mock methods in AdapterService

        doReturn(FAKE_HEADSET_UUID).when(mAdapterService)

                .getRemoteUuids(any(BluetoothDevice.class));

        doReturn(BluetoothDevice.BOND_BONDED).when(mAdapterService)

                .getBondState(any(BluetoothDevice.class));

        doAnswer(invocation -> mBondedDevices.toArray(new BluetoothDevice[]{})).when(

                mAdapterService).getBondedDevices();

        // Mock system interface
@@ -1139,6 +1137,8 @@ public class HeadsetServiceAndStateMachineTest { 
    private void connectTestDevice(BluetoothDevice device) {

        when(mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.HEADSET))

                .thenReturn(BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

        doReturn(BluetoothDevice.BOND_BONDED).when(mAdapterService)

                .getBondState(eq(device));

        // Make device bonded

        mBondedDevices.add(device);

        // Use connecting event to indicate that device is connecting