Merge "Moved from system API to public API" am: 0a281dd66e am: 5035d227c1 am: 141c011110

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455152 Change-Id: Ib76dd15bbb74e05f25e56667399b40a8eb914e1c
2020-10-13 22:50:54 +00:00
parent 2878d741fb 141c011110
commit 31bdb532c7
6 changed files with 2 additions and 5 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -13330,9 +13330,7 @@ public class TelephonyManager {
     * @throws IllegalStateException if the Telephony process is not currently available.
     * @throws SecurityException if the caller doesn't have the permission.
     *
-     * @hide
     */
-    @SystemApi
    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
    public @NonNull List<String> getEquivalentHomePlmns() {
        try {