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

Commit e761439f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[TelephonyMainline] @hide system api since we'll revisit in S - Cdma" am: eff8e993 

Change-Id: Ibca9d8e88989e028aee1ba00b0dbac0cab2c307d
parents 288837ff eff8e993

api/system-current.txt

+0 −6
Original line number Diff line number Diff line
@@ -9325,7 +9325,6 @@ 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(int);

    method public String getCdmaPrlVersion();

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

    method public int getCurrentPhoneType();

    method public int getCurrentPhoneType(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getDataActivationState();
@@ -9405,8 +9404,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallWaitingStatus(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 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 boolean setDataAllowedDuringVoiceCall(boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean);
@@ -9458,9 +9455,6 @@ package android.telephony { 
    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_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 int CHANGE_ICC_LOCK_SUCCESS = 2147483647; // 0x7fffffff

    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";

telephony/java/android/telephony/TelephonyManager.java

+0 −6
Original line number Diff line number Diff line
@@ -9180,7 +9180,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public @CdmaRoamingMode int getCdmaRoamingMode() {

        int mode = CDMA_ROAMING_MODE_RADIO_DEFAULT;
@@ -9209,7 +9208,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public boolean setCdmaRoamingMode(@CdmaRoamingMode int mode) {

        try {
@@ -9235,19 +9233,16 @@ public class TelephonyManager { 
    /** 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 */
@@ -9266,7 +9261,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public boolean setCdmaSubscriptionMode(@CdmaSubscription int mode) {

        try {