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

Commit 26715b89 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Hide car barring with password API." into rvc-dev

parents 3c788e8e 654c05b2

api/system-current.txt

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

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

    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 updateCallWaiting(boolean, int);

    method public int updateClip(boolean);

api/test-current.txt

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

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

    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 updateCallWaiting(boolean, int);

    method public int updateClip(boolean);

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

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ public class ImsUtImplBase { 


    /**

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

     * @hide

     */

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

            int serviceClass, @NonNull String password) {