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

Commit 4c1b1ff6 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Expose @hide APIs as @SystemApi"

parents 71e50f51 55957fcc

api/system-current.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -10567,6 +10567,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin(int);

    method public String getCdmaPrlVersion();

    method public String getCdmaPrlVersion();

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

    method public int getCurrentPhoneType();

    method public int getCurrentPhoneType();

    method public int getCurrentPhoneType(int);

    method public int getCurrentPhoneType(int);

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

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getDataActivationState();
@@ -10640,6 +10641,8 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setCarrierRestrictionRules(@NonNull android.telephony.CarrierRestrictionRules);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCdmaRoamingMode(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCdmaSubscriptionMode(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataActivationState(int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
@@ -10683,6 +10686,9 @@ package android.telephony { 
    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1

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

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

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

    field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff

    field public static final int CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED = -1; // 0xffffffff

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

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

    field public static final int CDMA_SUBSCRIPTION_UNKNOWN = -1; // 0xffffffff

    field public static final String EXTRA_ANOMALY_DESCRIPTION = "android.telephony.extra.ANOMALY_DESCRIPTION";

    field public static final String EXTRA_ANOMALY_DESCRIPTION = "android.telephony.extra.ANOMALY_DESCRIPTION";

    field public static final String EXTRA_ANOMALY_ID = "android.telephony.extra.ANOMALY_ID";

    field public static final String EXTRA_ANOMALY_ID = "android.telephony.extra.ANOMALY_ID";

    field @Deprecated public static final String EXTRA_APN_PROTOCOL = "apnProto";

    field @Deprecated public static final String EXTRA_APN_PROTOCOL = "apnProto";

telephony/java/android/telephony/TelephonyManager.java

+50 −7
Original line number Original line Diff line number Diff line
@@ -1104,6 +1104,16 @@ public class TelephonyManager { 
     */

     */

    public static final int CDMA_ROAMING_MODE_ANY = 2;

    public static final int CDMA_ROAMING_MODE_ANY = 2;





    /** @hide */

    @IntDef(prefix = { "CDMA_ROAMING_MODE_" }, value = {

            CDMA_ROAMING_MODE_RADIO_DEFAULT,

            CDMA_ROAMING_MODE_HOME,

            CDMA_ROAMING_MODE_AFFILIATED,

            CDMA_ROAMING_MODE_ANY

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CdmaRoamingMode{}



    /**

    /**

     * An unknown carrier id. It could either be subscription unavailable or the subscription

     * An unknown carrier id. It could either be subscription unavailable or the subscription

     * carrier cannot be recognized. Unrecognized carriers here means

     * carrier cannot be recognized. Unrecognized carriers here means
@@ -8974,8 +8984,9 @@ public class TelephonyManager { 
     *

     *

     * @hide

     * @hide

     */

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @SystemApi

    public int getCdmaRoamingMode() {

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public @CdmaRoamingMode int getCdmaRoamingMode() {

        int mode = CDMA_ROAMING_MODE_RADIO_DEFAULT;

        int mode = CDMA_ROAMING_MODE_RADIO_DEFAULT;

        try {

        try {

            ITelephony telephony = getITelephony();

            ITelephony telephony = getITelephony();
@@ -9002,8 +9013,9 @@ public class TelephonyManager { 
     *

     *

     * @hide

     * @hide

     */

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public boolean setCdmaRoamingMode(int mode) {

    public boolean setCdmaRoamingMode(@CdmaRoamingMode int mode) {

        try {

        try {

            ITelephony telephony = getITelephony();

            ITelephony telephony = getITelephony();

            if (telephony != null) {

            if (telephony != null) {
@@ -9015,6 +9027,36 @@ public class TelephonyManager { 
        return false;

        return false;

    }

    }





    /** @hide */

    @IntDef(flag = true, prefix = { "CDMA_SUBSCRIPTION_" }, value = {

            CDMA_SUBSCRIPTION_UNKNOWN,

            CDMA_SUBSCRIPTION_RUIM_SIM,

            CDMA_SUBSCRIPTION_NV

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CdmaSubscription{}



    /** Used for CDMA subscription mode, it'll be UNKNOWN if there is no Subscription source.

     * @hide

     */

    @SystemApi

    public static final int CDMA_SUBSCRIPTION_UNKNOWN  = -1;



    /** Used for CDMA subscription mode: RUIM/SIM (default)

     * @hide

     */

    @SystemApi

    public static final int CDMA_SUBSCRIPTION_RUIM_SIM = 0;



    /** Used for CDMA subscription mode: NV -> non-volatile memory

     * @hide

     */

    @SystemApi

    public static final int CDMA_SUBSCRIPTION_NV       = 1;



    /** @hide */

    public static final int PREFERRED_CDMA_SUBSCRIPTION = CDMA_SUBSCRIPTION_RUIM_SIM;



    /**

    /**

     * Sets the subscription mode for CDMA phone to the given mode {@code mode}.

     * Sets the subscription mode for CDMA phone to the given mode {@code mode}.

     *

     *
@@ -9022,14 +9064,15 @@ public class TelephonyManager { 
     *

     *

     * @return {@code true} if successed.

     * @return {@code true} if successed.

     *

     *

     * @see Phone#CDMA_SUBSCRIPTION_UNKNOWN

     * @see #CDMA_SUBSCRIPTION_UNKNOWN

     * @see Phone#CDMA_SUBSCRIPTION_RUIM_SIM

     * @see #CDMA_SUBSCRIPTION_RUIM_SIM

     * @see Phone#CDMA_SUBSCRIPTION_NV

     * @see #CDMA_SUBSCRIPTION_NV

     *

     *

     * @hide

     * @hide

     */

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public boolean setCdmaSubscriptionMode(int mode) {

    public boolean setCdmaSubscriptionMode(@CdmaSubscription int mode) {

        try {

        try {

            ITelephony telephony = getITelephony();

            ITelephony telephony = getITelephony();

            if (telephony != null) {

            if (telephony != null) {