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

Commit a19890e4 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Not use AudioManager.setParameters when isScoManagedByAudio is enabled"... 

Merge "Not use AudioManager.setParameters when isScoManagedByAudio is enabled" into main am: 831986d0

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



Change-Id: Ie16ca7c2df1217ceb214051f9bca629221c9a26a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7dcf9725 831986d0

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

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



    private void setAudioParameters() {

        if (Flags.isScoManagedByAudio()) {

            Log.i(TAG, "isScoManagedByAudio enabled, do not setAudioParameters");

            return;

        }

        AudioManager am = mSystemInterface.getAudioManager();

        Log.i(

                TAG,

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

+23 −0
Original line number Diff line number Diff line
@@ -1724,6 +1724,29 @@ public class HeadsetStateMachineTest { 
        verifyAudioSystemSetParametersInvocation(false, false);

    }



    @Test

    public void testSetAudioParameters_isScoManagedByAudio() {

        mSetFlagsRule.enableFlags(Flags.FLAG_IS_SCO_MANAGED_BY_AUDIO);



        setUpConnectedState();

        mHeadsetStateMachine.sendMessage(

                HeadsetStateMachine.STACK_EVENT,

                new HeadsetStackEvent(

                        HeadsetStackEvent.EVENT_TYPE_SWB,

                        HeadsetHalConstants.BTHF_SWB_CODEC_LC3,

                        HeadsetHalConstants.BTHF_SWB_YES,

                        mTestDevice));



        mHeadsetStateMachine.sendMessage(

                HeadsetStateMachine.STACK_EVENT,

                new HeadsetStackEvent(

                        HeadsetStackEvent.EVENT_TYPE_AUDIO_STATE_CHANGED,

                        HeadsetHalConstants.AUDIO_STATE_CONNECTED,

                        mTestDevice));



        verify(mAudioManager, times(0)).setParameters(any());

    }



    /**

     * verify parameters given to audio system

     *