Update TelMan API for testing Line1NumberForDisplay.

CTS testing is being added for
TelephonyManager#setLine1NumberForDisplay. This requires making the
getter for alphaTag visible for testing with the @TestApi annotation.

Bug: 31963371
Test: API change. tests are unaffected.
Merged-In: I85887cf05f395f4ac4ca8dc6800e29f4fc9f8de4
Change-Id: I85887cf05f395f4ac4ca8dc6800e29f4fc9f8de4
(cherry picked from commit 710cce6dd975644dd60b4bec48f19c188ac93209)

diff --git a/api/test-current.txt b/api/test-current.txt
index 7121a54..ab78876 100644 (file)
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -2698,6 +2698,7 @@ package android.telephony {
   public class TelephonyManager {
     method public int checkCarrierPrivilegesForPackage(String);
     method public int getCarrierIdListVersion();
+    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();
     method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
     method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 9c63a82..0d3bc1d 100644 (file)
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3790,6 +3790,7 @@ public class TelephonyManager {
      * @hide
      * nobody seems to call this.
      */
+    @TestApi
     @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
     public String getLine1AlphaTag() {
         return getLine1AlphaTag(getSubId());