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

Commit 75b795f4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update doc to reflect actual permission" into sc-dev

parents 4a63b26d 4d128934

core/api/system-current.txt

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

    method @Deprecated public boolean getDataEnabled(int);

    method @Nullable @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public android.content.ComponentName getDefaultRespondViaMessageApplication();

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

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

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

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();

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

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1907,14 +1907,14 @@ public class TelephonyManager { 
     * the IMEI/SV for GSM phones. Return null if the software version is

     * not available.

     * <p>

     * Requires Permission: READ_PRIVILEGED_PHONE_STATE.

     * Requires Permission: READ_PHONE_STATE.

     *

     * @param slotIndex of which deviceID is returned

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @Nullable

    public String getDeviceSoftwareVersion(int slotIndex) {

        ITelephony telephony = getITelephony();