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

Commit 417467ca authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Stay in MODE_CALL_SCREENING during SIMULATED_RINGING" into rvc-dev am: 8d58b990 

Change-Id: I90db075cc8d2fc1c1da19af90f5c63abe113313f
parents a21784b0 8d58b990

src/com/android/server/telecom/CallAudioModeStateMachine.java

+5 −1
Original line number Diff line number Diff line
@@ -357,7 +357,11 @@ public class CallAudioModeStateMachine extends StateMachine { 
            if (mCallAudioManager.startRinging()) {

                mAudioManager.requestAudioFocusForCall(AudioManager.STREAM_RING,

                        AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);

                // Do not set MODE_RINGTONE if we were previously in the CALL_SCREENING mode -- this

                // trips up the audio system.

                if (mAudioManager.getMode() != AudioManager.MODE_CALL_SCREENING) {

                    mAudioManager.setMode(AudioManager.MODE_RINGTONE);

                }

                mCallAudioManager.setCallAudioRouteFocusState(

                        CallAudioRouteStateMachine.RINGING_FOCUS);

            } else {

tests/src/com/android/server/telecom/tests/CallAudioModeTransitionTests.java

+7 −2
Original line number Diff line number Diff line
@@ -137,6 +137,11 @@ public class CallAudioModeTransitionTests extends TelecomTestCase { 


        resetMocks();

        when(mCallAudioManager.startRinging()).thenReturn(true);

        if (mParams.initialAudioState

                == CallAudioModeStateMachine.ENTER_AUDIO_PROCESSING_FOCUS_FOR_TESTING) {

            when(mAudioManager.getMode())

                    .thenReturn(CallAudioModeStateMachine.NEW_AUDIO_MODE_FOR_AUDIO_PROCESSING);

        }



        sm.sendMessage(mParams.messageType, mParams.externalState);

        waitForHandlerAction(sm.getHandler(), TEST_TIMEOUT);
@@ -815,7 +820,7 @@ public class CallAudioModeTransitionTests extends TelecomTestCase { 
                        .build(),

                CallAudioModeStateMachine.RING_STATE_NAME, // expectedFinalStateName

                FOCUS_RING, // expectedFocus

                AudioManager.MODE_RINGTONE, // expectedMode

                NO_CHANGE, // expectedMode

                ON, // expectedRingingInteraction

                // We expect a call to stopCallWaiting because it happens whenever the ringer starts

                OFF // expectedCallWaitingInteraction
@@ -836,7 +841,7 @@ public class CallAudioModeTransitionTests extends TelecomTestCase { 
                        .build(),

                CallAudioModeStateMachine.RING_STATE_NAME, // expectedFinalStateName

                FOCUS_RING, // expectedFocus

                AudioManager.MODE_RINGTONE, // expectedMode

                NO_CHANGE, // expectedMode

                ON, // expectedRingingInteraction

                // We expect a call to stopCallWaiting because it happens whenever the ringer starts

                OFF // expectedCallWaitingInteraction