diff options
3 files changed, 64 insertions, 20 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 9982b9bb7068..92ac61972697 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1992,24 +1992,6 @@ public class SubscriptionManager { } /** - * 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. * * <p>A valid subscription ID is not necessarily an active subscription ID diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0de93bc080eb..56a4b460e7fa 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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 diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index 6eb6fd8695e3..daea9d5c63d6 100755 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -267,8 +267,6 @@ interface ISub { void setDefaultSmsSubId(int subId); - void clearDefaultsForInactiveSubIds(); - @UnsupportedAppUsage int[] getActiveSubIdList(boolean visibleOnly); |