Merge "Make SubscriptionManager.isActiveSubId public" am: fafc51a088 am: a4107d39ad (be7250ce) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -42920,6 +42920,7 @@ package android.telephony {
		method public static int getSlotIndex(int);
		method public static int[] getSubscriptionIds(int);
		method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
		method public boolean isActiveSubscriptionId(int);
		method public boolean isNetworkRoaming(int);
		method public static boolean isValidSubscriptionId(int);
		method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);

+14 −1

Original line number	Diff line number	Diff line
		@@ -1851,6 +1851,19 @@ public class SubscriptionManager {
		return new Resources(context.getResources().getAssets(), newMetrics, newConfig);
		}

		/**
		* Checks if the supplied subscription ID corresponds to an active subscription.
		*
		* @param subscriptionId the subscription ID.
		* @return {@code true} if the supplied subscription ID corresponds to an active subscription;
		* {@code false} if it does not correspond to an active subscription; or throw a
		* SecurityException if the caller hasn't got the right permission.
		*/
		@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
		public boolean isActiveSubscriptionId(int subscriptionId) {
		return isActiveSubId(subscriptionId);
		}

		/**
		* @return true if the sub ID is active. i.e. The sub ID corresponds to a known subscription
		* and the SIM providing the subscription is present in a slot and in "LOADED" state.
		@@ -1861,7 +1874,7 @@ public class SubscriptionManager {
		try {
		ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
		if (iSub != null) {
		return iSub.isActiveSubId(subId);
		return iSub.isActiveSubId(subId, mContext.getOpPackageName());
		}
		} catch (RemoteException ex) {
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -232,5 +232,5 @@ interface ISub {
		*/
		int getSimStateForSlotIndex(int slotIndex);

		boolean isActiveSubId(int subId);
		boolean isActiveSubId(int subId, String callingPackage);
		}