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

Commit 096cd201 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API."

parents cab84c8d 4ff5ec3f

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -45045,7 +45045,7 @@ package android.telephony { 
    method public int getDataState();

    method @Deprecated @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDeviceId();

    method @Deprecated @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDeviceId(int);

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

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

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>> getEmergencyNumberList();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>> getEmergencyNumberList(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String[] getForbiddenPlmns();

api/system-current.txt

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

    method @Deprecated public boolean getDataEnabled(int);

    method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(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 @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();

telephony/java/android/telephony/TelephonyManager.java

+10 −7
Original line number Diff line number Diff line
@@ -1633,12 +1633,11 @@ public class TelephonyManager { 
     * Returns the software version number for the device, for example,

     * the IMEI/SV for GSM phones. Return null if the software version is

     * not available.

     *

     * <p>Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).

     * <p>

     * Requires Permission: {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}.

     */

    @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @Nullable

    public String getDeviceSoftwareVersion() {

        return getDeviceSoftwareVersion(getSlotIndex());

    }
@@ -1647,12 +1646,16 @@ public class TelephonyManager { 
     * Returns the software version number for the device, for example,

     * the IMEI/SV for GSM phones. Return null if the software version is

     * not available.

     * <p>

     * Requires Permission: READ_PRIVILEGED_PHONE_STATE.

     *

     * @param slotIndex of which deviceID is returned

     *

     * @hide

     */

    /** {@hide} */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @Nullable

    public String getDeviceSoftwareVersion(int slotIndex) {

        ITelephony telephony = getITelephony();

        if (telephony == null) return null;