Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update TelMan API for testing Line1NumberForDisplay."

Browse Source
This commit is contained in:
Cody Kesting
2019-04-10 15:15:14 +00:00
committed by Gerrit Code Review
parent 498562c3cb 710cce6dd9
commit d09bd9d9f6
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -1546,6 +1546,7 @@ package android.telephony {
public class TelephonyManager { public class TelephonyManager {
method public int getCarrierIdListVersion(); 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 public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
method public void setCarrierTestOverride(String, String, String, String, String, String, String); method public void setCarrierTestOverride(String, String, String, String, String, String, String);

1
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3733,6 +3733,7 @@ public class TelephonyManager {
* @hide * @hide
* nobody seems to call this. * nobody seems to call this.
*/ */
@TestApi
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public String getLine1AlphaTag() { public String getLine1AlphaTag() {
return getLine1AlphaTag(getSubId()); return getLine1AlphaTag(getSubId());