Merge "Make some SubscriptionManager APIs system APIs" (946d90b7) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5788,6 +5788,8 @@ package android.telephony {
	method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();		method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();
	method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);		method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
	method public void requestEmbeddedSubscriptionInfoListRefresh();		method public void requestEmbeddedSubscriptionInfoListRefresh();
			method public void setDefaultDataSubId(int);
			method public void setDefaultSmsSubId(int);
	method public void setSubscriptionOverrideCongested(int, boolean, long);		method public void setSubscriptionOverrideCongested(int, boolean, long);
	method public void setSubscriptionOverrideUnmetered(int, boolean, long);		method public void setSubscriptionOverrideUnmetered(int, boolean, long);
	method public void setSubscriptionPlans(int, java.util.List<android.telephony.SubscriptionPlan>);		method public void setSubscriptionPlans(int, java.util.List<android.telephony.SubscriptionPlan>);

telephony/java/android/telephony/SubscriptionManager.java

+28 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1590,14 +1590,23 @@ public class SubscriptionManager {
	return subId;		return subId;
	}		}

	/** @hide */		/**
	@UnsupportedAppUsage		* Set the subscription which will be used by default for SMS, with the subscription which
	public void setDefaultSmsSubId(int subId) {		* the supplied subscription ID corresponds to; or throw a RuntimeException if the supplied
	if (VDBG) logd("setDefaultSmsSubId sub id = " + subId);		* subscription ID is not usable (check with {@link #isUsableSubscriptionId(int)}).
			*
			* @param subscriptionId the supplied subscription ID
			*
			* @hide
			*/
			@SystemApi
			@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
			public void setDefaultSmsSubId(int subscriptionId) {
			if (VDBG) logd("setDefaultSmsSubId sub id = " + subscriptionId);
	try {		try {
	ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
	if (iSub != null) {		if (iSub != null) {
	iSub.setDefaultSmsSubId(subId);		iSub.setDefaultSmsSubId(subscriptionId);
	}		}
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	// ignore it		// ignore it
	@@ -1645,14 +1654,23 @@ public class SubscriptionManager {
	return subId;		return subId;
	}		}

	/** @hide */		/**
	@UnsupportedAppUsage		* Set the subscription which will be used by default for data, with the subscription which
	public void setDefaultDataSubId(int subId) {		* the supplied subscription ID corresponds to; or throw a RuntimeException if the supplied
	if (VDBG) logd("setDataSubscription sub id = " + subId);		* subscription ID is not usable (check with {@link #isUsableSubscriptionId(int)}).
			*
			* @param subscriptionId the supplied subscription ID
			*
			* @hide
			*/
			@SystemApi
			@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
			public void setDefaultDataSubId(int subscriptionId) {
			if (VDBG) logd("setDataSubscription sub id = " + subscriptionId);
	try {		try {
	ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
	if (iSub != null) {		if (iSub != null) {
	iSub.setDefaultDataSubId(subId);		iSub.setDefaultDataSubId(subscriptionId);
	}		}
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	// ignore it		// ignore it