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

Commit d3b8f793 authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge changes from topic "call_barring_password"

* changes:
  Update ImsPhoneTest for call barring password
  Add support to pass password in Call barring
parents b9072fec c174307d
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -1308,9 +1308,8 @@ public class ImsPhone extends ImsPhoneBase {

        try {
            ImsUtInterface ut = mCT.getUtInterface();
            // password is not required with Ut interface
            ut.updateCallBarring(getCBTypeFromFacility(facility), action,
                    resp, null,  serviceClass);
                    resp, null, serviceClass, password);
        } catch (ImsException e) {
            sendErrorResponse(onComplete, e);
        }
+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);
    }