commit 26715b895d1c3372b352d1d094aa097d671cbe59
author Tyler Gunn <tgunn@google.com> Mon Mar 16 21:18:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 16 21:18:12 2020 +0000
tree 760841b592bd47b87cd03d3cee24fcaaa7c80905
parent 3c788e8eb6e92dad061f780f08683b61ea906ca1
parent 654c05b23239ded073bbd4d7e5427415f3d935c7

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

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 3fdf241..573df9e 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -12928,7 +12928,6 @@
     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

diff --git a/api/test-current.txt b/api/test-current.txt
index a813bcb..f584e17 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -4682,7 +4682,6 @@
     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

diff --git a/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java b/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java
index 386a58e..8564f7a 100644
--- a/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java
+++ b/telephony/java/android/telephony/ims/stub/ImsUtImplBase.java
@@ -349,6 +349,7 @@
 
     /**
      * 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) {