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

Commit 537b96fd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Rename call barring constants" am: 54017dde am: d760aa6c am: abb83554 

Change-Id: Ic08d00533c564f9ce676af3a6819bdc2189ceddd
parents e7750bc1 abb83554

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+10 −9
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import android.telephony.ims.ImsSsData; 
import android.telephony.ims.ImsSsInfo;

import android.telephony.ims.RegistrationManager;

import android.telephony.ims.feature.ImsFeature;

import android.telephony.ims.stub.ImsUtImplBase;

import android.text.TextUtils;

import android.util.LocalLog;
@@ -1194,23 +1195,23 @@ public class ImsPhone extends ImsPhoneBase { 


    private int getCBTypeFromFacility(String facility) {

        if (CB_FACILITY_BAOC.equals(facility)) {

            return ImsUtInterface.CB_BAOC;

            return ImsUtImplBase.CALL_BARRING_ALL_OUTGOING;

        } else if (CB_FACILITY_BAOIC.equals(facility)) {

            return ImsUtInterface.CB_BOIC;

            return ImsUtImplBase.CALL_BARRING_OUTGOING_INTL;

        } else if (CB_FACILITY_BAOICxH.equals(facility)) {

            return ImsUtInterface.CB_BOIC_EXHC;

            return ImsUtImplBase.CALL_BARRING_OUTGOING_INTL_EXCL_HOME;

        } else if (CB_FACILITY_BAIC.equals(facility)) {

            return ImsUtInterface.CB_BAIC;

            return ImsUtImplBase.CALL_BARRING_ALL_INCOMING;

        } else if (CB_FACILITY_BAICr.equals(facility)) {

            return ImsUtInterface.CB_BIC_WR;

            return ImsUtImplBase.CALL_BLOCKING_INCOMING_WHEN_ROAMING;

        } else if (CB_FACILITY_BA_ALL.equals(facility)) {

            return ImsUtInterface.CB_BA_ALL;

            return ImsUtImplBase.CALL_BARRING_ALL;

        } else if (CB_FACILITY_BA_MO.equals(facility)) {

            return ImsUtInterface.CB_BA_MO;

            return ImsUtImplBase.CALL_BARRING_OUTGOING_ALL_SERVICES;

        } else if (CB_FACILITY_BA_MT.equals(facility)) {

            return ImsUtInterface.CB_BA_MT;

            return ImsUtImplBase.CALL_BARRING_INCOMING_ALL_SERVICES;

        } else if (CB_FACILITY_BIC_ACR.equals(facility)) {

            return ImsUtInterface.CB_BIC_ACR;

            return ImsUtImplBase.CALL_BARRING_ANONYMOUS_INCOMING;

        }



        return 0;

src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java

+13 −13
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ import android.telephony.ims.ImsReasonInfo; 
import android.telephony.ims.ImsSsData;

import android.telephony.ims.ImsSsInfo;

import android.telephony.ims.ImsUtListener;

import android.telephony.ims.stub.ImsUtImplBase;

import android.text.SpannableStringBuilder;

import android.text.TextUtils;



import com.android.ims.ImsException;

import com.android.ims.ImsUtInterface;

import com.android.internal.telephony.CallForwardInfo;

import com.android.internal.telephony.CallStateException;

import com.android.internal.telephony.CommandException;
@@ -975,8 +975,8 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
            } else if (mSc != null && (mSc.equals(SC_BS_MT))) {

                try {

                    if (isInterrogate()) {

                        mPhone.mCT.getUtInterface()

                        .queryCallBarring(ImsUtInterface.CB_BS_MT,

                        mPhone.mCT.getUtInterface().queryCallBarring(

                                ImsUtImplBase.CALL_BARRING_SPECIFIC_INCOMING_CALLS,

                                obtainMessage(EVENT_QUERY_ICB_COMPLETE, this));

                    } else {

                        processIcbMmiCodeForUpdate();
@@ -990,8 +990,8 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
                // TODO: Should we route through queryCallBarring() here?

                try {

                    if (isInterrogate()) {

                        mPhone.mCT.getUtInterface()

                        .queryCallBarring(ImsUtInterface.CB_BIC_ACR,

                        mPhone.mCT.getUtInterface().queryCallBarring(

                                ImsUtImplBase.CALL_BARRING_ANONYMOUS_INCOMING,

                                obtainMessage(EVENT_QUERY_ICB_COMPLETE, this));

                    } else {

                        if (isActivate()) {
@@ -1000,7 +1000,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
                            callAction = CommandsInterface.CF_ACTION_DISABLE;

                        }

                        mPhone.mCT.getUtInterface()

                                .updateCallBarring(ImsUtInterface.CB_BIC_ACR,

                                .updateCallBarring(ImsUtImplBase.CALL_BARRING_ANONYMOUS_INCOMING,

                                callAction,

                                obtainMessage(EVENT_SET_COMPLETE,this),

                                null);
@@ -1190,8 +1190,8 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
        callAction = callBarAction(dialingNumber);



        try {

            mPhone.mCT.getUtInterface()

            .updateCallBarring(ImsUtInterface.CB_BS_MT,

            mPhone.mCT.getUtInterface().updateCallBarring(

                    ImsUtImplBase.CALL_BARRING_SPECIFIC_INCOMING_CALLS,

                    callAction,

                    obtainMessage(EVENT_SET_COMPLETE, this),

                    icbNum);

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

+5 −3
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import android.telephony.ims.ImsReasonInfo; 
import android.telephony.ims.RegistrationManager;

import android.telephony.ims.aidl.IImsRegistrationCallback;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.telephony.ims.stub.ImsUtImplBase;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;
@@ -539,20 +540,21 @@ public class ImsPhoneTest extends TelephonyTest { 
                CommandsInterface.SERVICE_CLASS_NONE);



        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);

        verify(mImsUtInterface).queryCallBarring(eq(ImsUtInterface.CB_BAOC),

        verify(mImsUtInterface).queryCallBarring(eq(ImsUtImplBase.CALL_BARRING_ALL_OUTGOING),

                messageArgumentCaptor.capture(), eq(CommandsInterface.SERVICE_CLASS_NONE));

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



        mImsPhoneUT.setCallBarring(CommandsInterface.CB_FACILITY_BAOIC, true, "abc", msg,

                CommandsInterface.SERVICE_CLASS_NONE);

        verify(mImsUtInterface).updateCallBarring(eq(ImsUtInterface.CB_BOIC),

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

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

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

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



        mImsPhoneUT.setCallBarring(CommandsInterface.CB_FACILITY_BAOICxH, false, "abc", msg,

                CommandsInterface.SERVICE_CLASS_NONE);

        verify(mImsUtInterface).updateCallBarring(eq(ImsUtInterface.CB_BOIC_EXHC),

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

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