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

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

Merge "Update TelMan API for testing Line1NumberForDisplay."

am: d09bd9d9

Change-Id: I7cbd7e2a6ea11279d5eed8d8b307b00c30b73b89
parents cccb4f08 d09bd9d9
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1546,6 +1546,7 @@ package android.telephony {

  public class TelephonyManager {
    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 public void setCarrierTestOverride(String, String, String, String, String, String, String);
+1 −0
Original line number Diff line number Diff line
@@ -3733,6 +3733,7 @@ public class TelephonyManager {
     * @hide
     * nobody seems to call this.
     */
    @TestApi
    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
    public String getLine1AlphaTag() {
        return getLine1AlphaTag(getSubId());