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

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

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

Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock" into rvc-dev am: 83afbeec

Change-Id: I8373e1b911bbc4a50d5d3983d4ef1165d045facc
parents 9843a64a 83afbeec

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -11542,7 +11542,6 @@ package android.telephony { 














  public class TelephonyManager {















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










@@ -11608,7 +11607,6 @@ package android.telephony {













    method public boolean isDataConnectivityPossible();















    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) @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 isLteCdmaEvdoGsmWcdmaEnabled();










@@ -11647,7 +11645,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 setOpportunisticNetworkState(boolean);















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










@@ -11700,7 +11697,6 @@ package android.telephony {













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















    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








@@ -12960,7 +12960,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;































    /**









@@ -12973,7 +12972,6 @@ public class TelephonyManager {













     *















     * @hide















     */













    @SystemApi















    @WorkerThread















    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    public boolean isIccLockEnabled() {










@@ -13010,7 +13008,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.");










@@ -13044,7 +13041,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.");