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

Commit b0ef194e authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Fix Stub override when argument is already defined"

parents 67454ff7 89f1bb1e

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