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

Commit 724896df authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Hide car barring with password API." am: be8256ea 

Change-Id: Ia31f2457cb17a0b092c1a4f622b74ed443895243
parents 6974530a be8256ea

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -10340,7 +10340,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
@@ -4044,7 +4044,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
@@ -338,6 +338,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) {