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

Commit ab86455f authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge changes from topic "cherry-picks" am: a1c2f7f6 

am: 8724a396

Change-Id: Ib244051de36a9f52b425b3d4fac611f22b5390a2
parents d5a5f4d1 8724a396

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

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static org.junit.Assert.assertEquals; 
import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -117,7 +118,7 @@ public class CallAudioModeStateMachineTest extends TelecomTestCase { 
        sm.sendMessage(CallAudioModeStateMachine.RINGER_MODE_CHANGE);

        waitForHandlerAction(sm.getHandler(), TEST_TIMEOUT);



        verify(mCallAudioManager).startRinging();

        verify(mCallAudioManager, times(2)).startRinging();

        verify(mAudioManager).requestAudioFocusForCall(AudioManager.STREAM_RING,

                AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);

        verify(mAudioManager).setMode(AudioManager.MODE_RINGTONE);