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

This commit is contained in:
Tyler Gunn
2020-03-16 21:18:12 +00:00
committed by Android (Google) Code Review
3 changed files with 1 additions and 2 deletions

View File

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

View File

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

View File

@@ -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) {