Merge "Remove clearDefaultsForInactiveSubIds." (1e263e7b) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -1991,24 +1991,6 @@ public class SubscriptionManager {
		return true;
		}

		/**
		* If a default is set to subscription which is not active, this will reset that default back to
		* an invalid subscription id, i.e. < 0.
		* @hide
		*/
		@UnsupportedAppUsage
		public void clearDefaultsForInactiveSubIds() {
		if (VDBG) logd("clearDefaultsForInactiveSubIds");
		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		iSub.clearDefaultsForInactiveSubIds();
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		}

		/**
		* Check if the supplied subscription ID is valid.
		*

telephony/java/android/telephony/TelephonyManager.java

+64 −0

Original line number	Diff line number	Diff line
		@@ -1417,6 +1417,70 @@ public class TelephonyManager {
		public static final String EXTRA_ANOMALY_DESCRIPTION =
		"android.telephony.extra.ANOMALY_DESCRIPTION";

		/**
		* Broadcast intent sent to indicate primary (non-opportunistic) subscription list has changed.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED =
		"android.telephony.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED";

		/**
		* Integer intent extra to be used with {@link #ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED}
		* to indicate whether a SIM selection is needed to choose default subscription.
		*
		* @hide
		*/
		public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE =
		"android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";

		/**
		* Used as an int value for {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE}
		* to indicate there's no need to re-select any default subscription.
		* @hide
		*/
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE = 0;

		/**
		* Used as an int value for {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE}
		* to indicate there's a need to select default data subscription.
		* @hide
		*/
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA = 1;

		/**
		* Used as an int value for {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE}
		* to indicate there's a need to select default voice call subscription.
		* @hide
		*/
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_VOICE = 2;

		/**
		* Used as an int value for {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE}
		* to indicate there's a need to select default sms subscription.
		* @hide
		*/
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_SMS = 3;

		/**
		* Used as an int value for {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE}
		* to indicate user to decide whether current SIM should be preferred for all
		* data / voice / sms.
		* @hide
		*/
		public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_FOR_ALL_TYPES = 4;

		/**
		* Integer intent extra to be used with
		* {@link #EXTRA_DEFAULT_SUBSCRIPTION_SELECT_FOR_ALL_TYPES}
		* to indicate which SIM is being selected.
		*
		* @hide
		*/
		public static final String EXTRA_DEFAULT_SUBSCRIPTION_ID =
		"android.telephony.extra.DEFAULT_SUBSCRIPTION_ID";

		//
		//
		// Device Info

telephony/java/com/android/internal/telephony/ISub.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -267,8 +267,6 @@ interface ISub {

		void setDefaultSmsSubId(int subId);

		void clearDefaultsForInactiveSubIds();

		@UnsupportedAppUsage
		int[] getActiveSubIdList(boolean visibleOnly);