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

Commit 792ce880 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "add missing annotation for TelephonyManager APIs"

parents 02586ec5 5a2b4509

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -43043,8 +43043,8 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getImei();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getImei(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}) public String getLine1Number();

    method public String getManufacturerCode();

    method public String getManufacturerCode(int);

    method @Nullable public String getManufacturerCode();

    method @Nullable public String getManufacturerCode(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getMeid();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getMeid(int);

    method public String getMmsUAProfUrl();
@@ -43071,8 +43071,8 @@ package android.telephony { 
    method public int getSimState();

    method public int getSimState(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getSubscriberId();

    method public String getTypeAllocationCode();

    method public String getTypeAllocationCode(int);

    method @Nullable public String getTypeAllocationCode();

    method @Nullable public String getTypeAllocationCode(int);

    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") @NonNull public java.util.List<android.telephony.UiccCardInfo> getUiccCardsInfo();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVisualVoicemailPackageName();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailAlphaTag();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6364,7 +6364,7 @@ package android.telephony { 
    method @Deprecated public boolean getDataEnabled(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.util.Pair<java.lang.Integer,java.lang.Integer>> getLogicalToPhysicalSlotMapping();

    method public static long getMaxNumberVerificationTimeoutMillis();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmap();

telephony/java/android/telephony/TelephonyManager.java

+5 −0
Original line number Diff line number Diff line
@@ -1539,6 +1539,7 @@ public class TelephonyManager { 
     * Returns the Type Allocation Code from the IMEI. Return null if Type Allocation Code is not

     * available.

     */

    @Nullable

    public String getTypeAllocationCode() {

        return getTypeAllocationCode(getSlotIndex());

    }
@@ -1549,6 +1550,7 @@ public class TelephonyManager { 
     *

     * @param slotIndex of which Type Allocation Code is returned

     */

    @Nullable

    public String getTypeAllocationCode(int slotIndex) {

        ITelephony telephony = getITelephony();

        if (telephony == null) return null;
@@ -1601,6 +1603,7 @@ public class TelephonyManager { 
     * Returns the Manufacturer Code from the MEID. Return null if Manufacturer Code is not

     * available.

     */

    @Nullable

    public String getManufacturerCode() {

        return getManufacturerCode(getSlotIndex());

    }
@@ -1611,6 +1614,7 @@ public class TelephonyManager { 
     *

     * @param slotIndex of which Type Allocation Code is returned

     */

    @Nullable

    public String getManufacturerCode(int slotIndex) {

        ITelephony telephony = getITelephony();

        if (telephony == null) return null;
@@ -5981,6 +5985,7 @@ public class TelephonyManager { 
     * @return IMS Service Table or null if not present or not loaded

     * @hide

     */

    @Nullable

    @SystemApi

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public String getIsimIst() {