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

Commit fd8bc790 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topic "call_barring_password" am: d3b8f793 am: c3de1b22 

Change-Id: I22f5686538058e1792fadbc75d76310a6eaa2d5c
parents d2377fc1 c3de1b22

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);

    }