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

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

Merge "Add support to pass password in Call barring"

parents 9cd249c1 ec1da295

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -10649,6 +10649,7 @@ package android.telephony.ims.stub { 
    method public int transact(android.os.Bundle);

    method public int transact(android.os.Bundle);

    method public int updateCallBarring(int, int, String[]);

    method public int updateCallBarring(int, int, String[]);

    method public int updateCallBarringForServiceClass(int, int, String[], int);

    method public int updateCallBarringForServiceClass(int, int, String[], int);

    method public int updateCallBarringWithPassword(int, int, @Nullable String[], int, @NonNull String);

    method public int updateCallForward(int, int, String, int, int);

    method public int updateCallForward(int, int, String, int, int);

    method public int updateCallWaiting(boolean, int);

    method public int updateCallWaiting(boolean, int);

    method public int updateClip(boolean);

    method public int updateClip(boolean);

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -3933,6 +3933,7 @@ package android.telephony.ims.stub { 
    method public int transact(android.os.Bundle);

    method public int transact(android.os.Bundle);

    method public int updateCallBarring(int, int, String[]);

    method public int updateCallBarring(int, int, String[]);

    method public int updateCallBarringForServiceClass(int, int, String[], int);

    method public int updateCallBarringForServiceClass(int, int, String[], int);

    method public int updateCallBarringWithPassword(int, int, @Nullable String[], int, @NonNull String);

    method public int updateCallForward(int, int, String, int, int);

    method public int updateCallForward(int, int, String, int, int);

    method public int updateCallWaiting(boolean, int);

    method public int updateCallWaiting(boolean, int);

    method public int updateClip(boolean);

    method public int updateClip(boolean);

telephony/java/android/telephony/ims/stub/ImsUtImplBase.java

+17 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ 
package android.telephony.ims.stub;

package android.telephony.ims.stub;





import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.TestApi;

import android.os.Bundle;

import android.os.Bundle;
@@ -206,6 +208,13 @@ public class ImsUtImplBase { 
            return ImsUtImplBase.this.updateCallBarringForServiceClass(

            return ImsUtImplBase.this.updateCallBarringForServiceClass(

                    cbType, action, barrList, serviceClass);

                    cbType, action, barrList, serviceClass);

        }

        }



        @Override

        public int updateCallBarringWithPassword(int cbType, int action, String[] barrList,

                int serviceClass, String password) throws RemoteException {

            return ImsUtImplBase.this.updateCallBarringWithPassword(

                    cbType, action, barrList, serviceClass, password);

        }

    };

    };





    /**

    /**
@@ -327,6 +336,14 @@ public class ImsUtImplBase { 
        return -1;

        return -1;

    }

    }





    /**

     * Updates the configuration of the call barring for specified service class with password.

     */

    public int updateCallBarringWithPassword(int cbType, int action, @Nullable String[] barrList,

            int serviceClass, @NonNull String password) {

        return -1;

    }



    /**

    /**

     * Updates the configuration of the call forward.

     * Updates the configuration of the call forward.

     */

     */

telephony/java/com/android/ims/ImsUtInterface.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -165,6 +165,12 @@ public interface ImsUtInterface { 
    public void updateCallBarring(int cbType, int action, Message result,

    public void updateCallBarring(int cbType, int action, Message result,

            String[] barrList, int serviceClass);

            String[] barrList, int serviceClass);





    /**

     * Modifies the configuration of the call barring for specified service class with password.

     */

    public void updateCallBarring(int cbType, int action, Message result,

            String[] barrList, int serviceClass, String password);



    /**

    /**

     * Modifies the configuration of the call forward.

     * Modifies the configuration of the call forward.

     */

     */

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -122,4 +122,10 @@ interface IImsUt { 
     */

     */

    int updateCallBarringForServiceClass(int cbType, int action, in String[] barrList,

    int updateCallBarringForServiceClass(int cbType, int action, in String[] barrList,

            int serviceClass);

            int serviceClass);



    /**

     * Updates the configuration of the call barring for specified service class with password.

     */

    int updateCallBarringWithPassword(int cbType, int action, in String[] barrList,

            int serviceClass, String password);

}
 
}