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

Commit 8fa0823b authored by Sheng-Chieh Lo's avatar Sheng-Chieh Lo Committed by Automerger Merge Worker
Browse files

Merge "Revert "Prevent sending partial CLCC responses"" am: 6061befb 

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



Change-Id: I395d574b68f54a99f414730b1d927866f7528477
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 491d1a5b 6061befb

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+3 −5
Original line number Diff line number Diff line
@@ -330,10 +330,8 @@ public class HeadsetService extends ProfileService { 


    private void doForEachConnectedStateMachine(List<StateMachineTask> tasks) {

        synchronized (mStateMachines) {

            for (BluetoothDevice device : getConnectedDevices()) {

            for (StateMachineTask task : tasks) {

                    task.execute(mStateMachines.get(device));

                }

                doForEachConnectedStateMachine(task);

            }

        }

    }
@@ -1868,7 +1866,7 @@ public class HeadsetService extends ProfileService { 
    }



    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    void clccResponse(int index, int direction, int status, int mode, boolean mpty,

    private void clccResponse(int index, int direction, int status, int mode, boolean mpty,

            String number, int type) {

        enforceCallingOrSelfPermission(MODIFY_PHONE_STATE, "Need MODIFY_PHONE_STATE permission");

        mPendingClccResponses.add(

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

+0 −54
Original line number Diff line number Diff line
@@ -872,60 +872,6 @@ public class HeadsetServiceTest { 
                ASYNC_CALL_TIMEOUT_MILLIS);

    }



    /**

     * Verifies that all CLCC responses are sent to the connected device.

     */

    @Test

    public void testClccResponse_withOneDevice() {

        when(mDatabaseManager.getProfileConnectionPolicy(any(BluetoothDevice.class),

                eq(BluetoothProfile.HEADSET)))

                .thenReturn(BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

        mCurrentDevice = TestUtils.getTestDevice(mAdapter, 0);

        Assert.assertTrue(mHeadsetService.connect(mCurrentDevice));

        verify(mObjectsFactory).makeStateMachine(mCurrentDevice,

                mHeadsetService.getStateMachinesThreadLooper(), mHeadsetService, mAdapterService,

                mNativeInterface, mSystemInterface);

        when(mStateMachines.get(mCurrentDevice).getDevice()).thenReturn(mCurrentDevice);

        when(mStateMachines.get(mCurrentDevice).getConnectionState()).thenReturn(

                BluetoothProfile.STATE_CONNECTED);

        Assert.assertEquals(BluetoothProfile.STATE_CONNECTED,

                mHeadsetService.getConnectionState(mCurrentDevice));

        mHeadsetService.clccResponse(1, 0, 0, 0, false, "8225319000", 0);

        // index 0 is the end mark of CLCC response.

        mHeadsetService.clccResponse(0, 0, 0, 0, false, "8225319000", 0);

        verify(mStateMachines.get(mCurrentDevice), times(2)).sendMessage(

                eq(HeadsetStateMachine.SEND_CLCC_RESPONSE), any(HeadsetClccResponse.class));

    }



    /**

     * Verifies that all CLCC responses are sent to the connected devices even it is connected in

     * the middle of generating CLCC responses.

     */

    @Test

    public void testClccResponse_withMultipleDevices() {

        ArrayList<BluetoothDevice> connectedDevices = new ArrayList<>();

        when(mDatabaseManager.getProfileConnectionPolicy(any(BluetoothDevice.class),

                eq(BluetoothProfile.HEADSET)))

                .thenReturn(BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

        for (int i = 2; i >= 0; i--) {

            mCurrentDevice = TestUtils.getTestDevice(mAdapter, i);

            Assert.assertTrue(mHeadsetService.connect(mCurrentDevice));

            verify(mObjectsFactory).makeStateMachine(mCurrentDevice,

                    mHeadsetService.getStateMachinesThreadLooper(), mHeadsetService,

                    mAdapterService, mNativeInterface, mSystemInterface);

            when(mStateMachines.get(mCurrentDevice).getDevice()).thenReturn(mCurrentDevice);

            when(mStateMachines.get(mCurrentDevice).getConnectionState()).thenReturn(

                    BluetoothProfile.STATE_CONNECTED);

            connectedDevices.add(mCurrentDevice);

            // index 0 is the end mark of CLCC response.

            mHeadsetService.clccResponse(i, 0, 0, 0, false, "8225319000", 0);

        }

        for (int i = 2; i >= 0; i--) {

            verify(mStateMachines.get(connectedDevices.get(i)), times(3)).sendMessage(

                    eq(HeadsetStateMachine.SEND_CLCC_RESPONSE), any(HeadsetClccResponse.class));

        }

    }



    /**

     * Test that whether active device been removed after enable silence mode

     */