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

Commit 0fb60746 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Replace when with doReturn" into main

parents 1250d412 d94cb9c8

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -613,11 +613,11 @@ public class SatelliteControllerTest extends TelephonyTest { 
                SATELLITE_RESULT_REQUEST_ABORTED);

        mServiceState2 = mock(ServiceState.class);

        when(mPhone.getServiceState()).thenReturn(mServiceState);

        when(mPhone.getSubId()).thenReturn(SUB_ID);

        doReturn(SUB_ID).when(mPhone).getSubId();

        when(mPhone.getPhoneId()).thenReturn(0);

        when(mPhone.getSignalStrengthController()).thenReturn(mSignalStrengthController);

        when(mPhone2.getServiceState()).thenReturn(mServiceState2);

        when(mPhone2.getSubId()).thenReturn(SUB_ID1);

        doReturn(SUB_ID1).when(mPhone2).getSubId();

        when(mPhone2.getPhoneId()).thenReturn(1);

        when(mPhone2.getSignalStrengthController()).thenReturn(mSignalStrengthController);