Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35d7aade authored by Cody Kesting's avatar Cody Kesting Committed by android-build-merger
Browse files

Merge "Update TelMan API for testing Line1NumberForDisplay." into qt-dev am: fa1676bd 

am: b7c6d9aa

Change-Id: Ib8aa4daa1edb86f6b56368a3996af0ac92e5bb77
parents 78a08660 b7c6d9aa

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2699,6 +2699,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);

telephony/java/android/telephony/TelephonyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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());