diff options
| author | 2019-04-04 16:56:34 -0700 | |
|---|---|---|
| committer | 2019-04-10 09:04:28 -0700 | |
| commit | c81d04d6759f855ff870f5e05a88aa68963b37ab (patch) | |
| tree | c3f7602e2c6354be308b8cdb1a08b349d044aec4 | |
| parent | 9214de571f70e25164d884bd331875c4bdb228d7 (diff) | |
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)
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 7121a549176a..ab78876f5dc3 100644 --- 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 9c63a82b5673..0d3bc1db831f 100644 --- 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()); |