Merge "[Settings] Expose @hide APIs as @SystemApi" am: 3091498e78 (8811b44d) · Commits · e / os / android_frameworks_base

api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -9659,6 +9659,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(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();
		@@ -9736,6 +9737,8 @@ 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);
		@@ -9783,6 +9786,9 @@ 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

+50 −7

Original line number	Diff line number	Diff line
		@@ -1100,6 +1100,16 @@ public class TelephonyManager {
		*/
		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
		* carrier cannot be recognized. Unrecognized carriers here means
		@@ -9029,8 +9039,9 @@ public class TelephonyManager {
		*
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
		public int getCdmaRoamingMode() {
		@SystemApi
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public @CdmaRoamingMode int getCdmaRoamingMode() {
		int mode = CDMA_ROAMING_MODE_RADIO_DEFAULT;
		try {
		ITelephony telephony = getITelephony();
		@@ -9057,8 +9068,9 @@ public class TelephonyManager {
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public boolean setCdmaRoamingMode(int mode) {
		public boolean setCdmaRoamingMode(@CdmaRoamingMode int mode) {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		@@ -9070,6 +9082,36 @@ public class TelephonyManager {
		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}.
		*
		@@ -9077,14 +9119,15 @@ public class TelephonyManager {
		*
		* @return {@code true} if successed.
		*
		* @see Phone#CDMA_SUBSCRIPTION_UNKNOWN
		* @see Phone#CDMA_SUBSCRIPTION_RUIM_SIM
		* @see Phone#CDMA_SUBSCRIPTION_NV
		* @see #CDMA_SUBSCRIPTION_UNKNOWN
		* @see #CDMA_SUBSCRIPTION_RUIM_SIM
		* @see #CDMA_SUBSCRIPTION_NV
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public boolean setCdmaSubscriptionMode(int mode) {
		public boolean setCdmaSubscriptionMode(@CdmaSubscription int mode) {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {