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

Commit 685fe6f4 authored by Zoey Chen's avatar Zoey Chen Committed by Gerrit Code Review
Browse files

Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock"

parents 4b0fc3fd 51670b21

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -9274,7 +9274,6 @@ package android.telephony { 
  public class TelephonyManager {

    method public int addDevicePolicyOverrideApn(@NonNull android.content.Context, @NonNull android.telephony.data.ApnSetting);

    method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int changeIccLockPassword(@NonNull String, @NonNull String);

    method public int checkCarrierPrivilegesForPackage(String);

    method public int checkCarrierPrivilegesForPackageAnyPhone(String);

    method public void dial(String);
@@ -9340,7 +9339,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);

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

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

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

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

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

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isManualNetworkSelectionAllowed();
@@ -9378,7 +9376,6 @@ package android.telephony { 
    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 @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIccLockEnabled(boolean, @NonNull String);

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

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(@NonNull String, int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);
@@ -9425,7 +9422,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 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";

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

telephony/java/android/telephony/TelephonyManager.java

+0 −4
Original line number Diff line number Diff line
@@ -12870,7 +12870,6 @@ public class TelephonyManager { 
     * The IccLock state or password was changed successfully.

     * @hide

     */

    @SystemApi

    public static final int CHANGE_ICC_LOCK_SUCCESS = Integer.MAX_VALUE;



    /**
@@ -12883,7 +12882,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @WorkerThread

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isIccLockEnabled() {
@@ -12920,7 +12918,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public int setIccLockEnabled(boolean enabled, @NonNull String password) {

        checkNotNull(password, "setIccLockEnabled password can't be null.");
@@ -12954,7 +12951,6 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public int changeIccLockPassword(@NonNull String oldPassword, @NonNull String newPassword) {

        checkNotNull(oldPassword, "changeIccLockPassword oldPassword can't be null.");