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

Commit 3db5c8c0 authored by Grace Chen's avatar Grace Chen Committed by Android (Google) Code Review
Browse files

Merge "Make setSimPowerState systemAPI"

parents 3cd9ef67 626ee8db

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -4397,6 +4397,8 @@ package android.telephony { 
    method public int[] supplyPukReportResult(java.lang.String, java.lang.String);

    method public void toggleRadioOnOff();

    method public void updateServiceLocation();

    method public void setSimPowerState(int);

    method public void setSimPowerStateForSlot(int, int);

    field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe

    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1

    field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0

telephony/java/android/telephony/TelephonyManager.java

+6 −2
Original line number Diff line number Diff line
@@ -6264,8 +6264,10 @@ public class TelephonyManager { 
     * <p>Requires Permission:

     *   {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}

     *

     * @hide

     * {@hide}

     **/

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void setSimPowerState(int state) {

        setSimPowerStateForSlot(getSlotIndex(), state);

    }
@@ -6284,8 +6286,10 @@ public class TelephonyManager { 
     * <p>Requires Permission:

     *   {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}

     *

     * @hide

     * {@hide}

     **/

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void setSimPowerStateForSlot(int slotIndex, int state) {

        try {

            ITelephony telephony = getITelephony();