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

Commit 546e3e02 authored by Hall Liu's avatar Hall Liu
Browse files

Fix Telecom tests 

A myriad of changes to fix broken/flaky Telecom tests

Test: unit tests
Change-Id: I819771a174bac4299380ea52513dd7762000074c
parent 596c41ed

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

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ import com.android.internal.util.State; 
import com.android.internal.util.StateMachine;



public class CallAudioModeStateMachine extends StateMachine {

    public static class Factory {

        public CallAudioModeStateMachine create(AudioManager am) {

            return new CallAudioModeStateMachine(am);

        }

    }



    public static class MessageArgs {

        public boolean hasActiveOrDialingCalls;

        public boolean hasRingingCalls;

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

+18 −0
Original line number Diff line number Diff line
@@ -72,6 +72,24 @@ import java.util.Objects; 
 */

public class CallAudioRouteStateMachine extends StateMachine {



    public static class Factory {

        public CallAudioRouteStateMachine create(

                Context context,

                CallsManager callsManager,

                BluetoothRouteManager bluetoothManager,

                WiredHeadsetManager wiredHeadsetManager,

                StatusBarNotifier statusBarNotifier,

                CallAudioManager.AudioServiceFactory audioServiceFactory,

                int earpieceControl) {

            return new CallAudioRouteStateMachine(context,

                    callsManager,

                    bluetoothManager,

                    wiredHeadsetManager,

                    statusBarNotifier,

                    audioServiceFactory,

                    earpieceControl);

        }

    }

    /** Values for CallAudioRouteStateMachine constructor's earPieceRouting arg. */

    public static final int EARPIECE_FORCE_DISABLED = 0;

    public static final int EARPIECE_FORCE_ENABLED  = 1;

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

+13 −10
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ public class CallsManager extends Call.ListenerBase 
            InCallTonePlayer.ToneGeneratorFactory toneGeneratorFactory,

            ClockProxy clockProxy,

            BluetoothStateReceiver bluetoothStateReceiver,

            CallAudioRouteStateMachine.Factory callAudioRouteStateMachineFactory,

            CallAudioModeStateMachine.Factory callAudioModeStateMachineFactory,

            InCallControllerFactory inCallControllerFactory) {

        mContext = context;

        mLock = lock;
@@ -386,7 +388,8 @@ public class CallsManager extends Call.ListenerBase 


        mDtmfLocalTonePlayer =

                new DtmfLocalTonePlayer(new DtmfLocalTonePlayer.ToneGeneratorProxy());

        CallAudioRouteStateMachine callAudioRouteStateMachine = new CallAudioRouteStateMachine(

        CallAudioRouteStateMachine callAudioRouteStateMachine =

                callAudioRouteStateMachineFactory.create(

                        context,

                        this,

                        bluetoothManager,
@@ -418,7 +421,7 @@ public class CallsManager extends Call.ListenerBase 
        mCallRecordingTonePlayer = new CallRecordingTonePlayer(mContext,

                (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE), mLock);

        mCallAudioManager = new CallAudioManager(callAudioRouteStateMachine,

                this,new CallAudioModeStateMachine((AudioManager)

                this, callAudioModeStateMachineFactory.create((AudioManager)

                        mContext.getSystemService(Context.AUDIO_SERVICE)),

                playerFactory, mRinger, new RingbackPlayer(playerFactory),

                bluetoothStateReceiver, mDtmfLocalTonePlayer);

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

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ public class TelecomSystem { 
                toneGeneratorFactory,

                clockProxy,

                bluetoothStateReceiver,

                new CallAudioRouteStateMachine.Factory(),

                new CallAudioModeStateMachine.Factory(),

                inCallControllerFactory);



        mIncomingCallNotifier = incomingCallNotifier;

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

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import static org.mockito.Mockito.when; 


@RunWith(JUnit4.class)

public class AsyncBlockCheckFilterTest extends TelecomTestCase {

    @Mock private Context mContext;

    @Mock private BlockCheckerAdapter mBlockCheckerAdapter;

    @Mock private Call mCall;

    @Mock private CallFilterResultCallback mCallback;