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

Commit c3de1b22 authored by Sarah Chin's avatar Sarah Chin Committed by android-build-merger
Browse files

Merge changes from topic "call_barring_password" 

am: d3b8f793

Change-Id: I92fa98c9ce7ca28211224331246f2f4c0bebc6c9
parents 32554a14 d3b8f793

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java

+2 −2
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ public class ImsPhoneTest extends TelephonyTest { 
                CommandsInterface.SERVICE_CLASS_NONE);

        verify(mImsUtInterface).updateCallBarring(eq(ImsUtImplBase.CALL_BARRING_OUTGOING_INTL),

                eq(CommandsInterface.CF_ACTION_ENABLE), messageArgumentCaptor.capture(),

                (String[]) eq(null), eq(CommandsInterface.SERVICE_CLASS_NONE));

                (String[]) eq(null), eq(CommandsInterface.SERVICE_CLASS_NONE), eq("abc"));

        assertEquals(msg, messageArgumentCaptor.getValue().obj);



        mImsPhoneUT.setCallBarring(CommandsInterface.CB_FACILITY_BAOICxH, false, "abc", msg,
@@ -554,7 +554,7 @@ public class ImsPhoneTest extends TelephonyTest { 
        verify(mImsUtInterface).updateCallBarring(

                eq(ImsUtImplBase.CALL_BARRING_OUTGOING_INTL_EXCL_HOME),

                eq(CommandsInterface.CF_ACTION_DISABLE), messageArgumentCaptor.capture(),

                (String[])eq(null), eq(CommandsInterface.SERVICE_CLASS_NONE));

                (String[]) eq(null), eq(CommandsInterface.SERVICE_CLASS_NONE), eq("abc"));

        assertEquals(msg, messageArgumentCaptor.getValue().obj);

    }