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

Commit 68c0ba3a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "IMS : Incoming Call Barring"

parents 1d156c96 3fd6fb83

telephony/java/com/android/ims/ImsSsInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ public class ImsSsInfo implements Parcelable { 


    // 0: disabled, 1: enabled

    public int mStatus;

    public String mIcbNum;



    public ImsSsInfo() {

    }
@@ -50,6 +51,7 @@ public class ImsSsInfo implements Parcelable { 
    @Override

    public void writeToParcel(Parcel out, int flags) {

        out.writeInt(mStatus);

        out.writeString(mIcbNum);

    }



    @Override
@@ -59,6 +61,7 @@ public class ImsSsInfo implements Parcelable { 


    private void readFromParcel(Parcel in) {

        mStatus = in.readInt();

        mIcbNum = in.readString();

    }



    public static final Creator<ImsSsInfo> CREATOR =

telephony/java/com/android/ims/internal/IImsUt.aidl

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ interface IImsUt { 
    /**

     * Updates the configuration of the call barring.

     */

    int updateCallBarring(int cbType, boolean enable, in String[] barrList);

    int updateCallBarring(int cbType, int action, in String[] barrList);



    /**

     * Updates the configuration of the call forward.