From 6f25ca88db07baebe1af3520ad00bc95f4973782 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Mon, 12 Oct 2020 22:25:31 -0700 Subject: [PATCH] Moved from system API to public API Fix: 170226261 Test: Manual Change-Id: Icef3bd23dbd79d60c1d8edc5ce8df07e642d146c --- api/current.txt | 1 + api/system-current.txt | 1 - non-updatable-api/current.txt | 1 + non-updatable-api/system-current.txt | 1 - telephony/api/system-current.txt | 1 - telephony/java/android/telephony/TelephonyManager.java | 2 -- 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/api/current.txt b/api/current.txt index 66f2340b1ca15..b405506f6f032 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48255,6 +48255,7 @@ package android.telephony { method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getDeviceSoftwareVersion(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.Map> getEmergencyNumberList(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.Map> getEmergencyNumberList(int); + method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List getEquivalentHomePlmns(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String[] getForbiddenPlmns(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getGroupIdLevel1(); method public String getIccAuthentication(int, int, String); diff --git a/api/system-current.txt b/api/system-current.txt index e163e7d792552..8caa32039ff61 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11187,7 +11187,6 @@ package android.telephony { method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion(); - method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List getEquivalentHomePlmns(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map getLogicalToPhysicalSlotMapping(); diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index afecd9a0f1378..7bee3b68a5616 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -46423,6 +46423,7 @@ package android.telephony { method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getDeviceSoftwareVersion(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.Map> getEmergencyNumberList(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.Map> getEmergencyNumberList(int); + method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List getEquivalentHomePlmns(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String[] getForbiddenPlmns(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getGroupIdLevel1(); method public String getIccAuthentication(int, int, String); diff --git a/non-updatable-api/system-current.txt b/non-updatable-api/system-current.txt index 2b3e7815d0609..20e6bf9801f7f 100644 --- a/non-updatable-api/system-current.txt +++ b/non-updatable-api/system-current.txt @@ -10069,7 +10069,6 @@ package android.telephony { method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion(); - method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List getEquivalentHomePlmns(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map getLogicalToPhysicalSlotMapping(); diff --git a/telephony/api/system-current.txt b/telephony/api/system-current.txt index ddc608413db89..ac88560dbbd9c 100644 --- a/telephony/api/system-current.txt +++ b/telephony/api/system-current.txt @@ -660,7 +660,6 @@ package android.telephony { method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion(); - method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List getEquivalentHomePlmns(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain(); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map getLogicalToPhysicalSlotMapping(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index e7af0534b7c92..a0a90b6d8fbd1 100644 --- 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 getEquivalentHomePlmns() { try {