Merge "setCdmaSubscription/RoamingMode returns when not CDMA" into sc-dev (1c97b8d7) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -9980,7 +9980,8 @@ public class TelephonyManager {
		}

		/**
		* Sets the roaming mode for CDMA phone to the given mode {@code mode}.
		* Sets the roaming mode for CDMA phone to the given mode {@code mode}. If the phone is not
		* CDMA capable, this method does nothing.
		*
		* <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
		* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()}
		@@ -10003,6 +10004,7 @@ public class TelephonyManager {
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public void setCdmaRoamingMode(@CdmaRoamingMode int mode) {
		if (getPhoneType() != PHONE_TYPE_CDMA) return;
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		@@ -10083,7 +10085,8 @@ public class TelephonyManager {
		}

		/**
		* 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}. If the phone is not
		* CDMA capable, this method does nothing.
		*
		* @param mode CDMA subscription mode.
		* @throws SecurityException if the caller does not have the permission.
		@@ -10102,6 +10105,7 @@ public class TelephonyManager {
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public void setCdmaSubscriptionMode(@CdmaSubscription int mode) {
		if (getPhoneType() != PHONE_TYPE_CDMA) return;
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {