Merge "Make setMetered and setOpportunistic public." am: 1f2e882554 (3d57bd7f) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SubscriptionController.java

+70 −7

Original line number	Diff line number	Diff line
		@@ -2297,29 +2297,92 @@ public class SubscriptionController extends ISub.Stub {
		}

		/**
		* Switch to a certain subscription
		* Set whether a subscription is opportunistic.
		*
		* Throws SecurityException if doesn't have required permission.
		*
		* @param opportunistic whether it’s opportunistic subscription.
		* @param subId the unique SubscriptionInfo index in database
		* @param callingPackage The package making the IPC.
		* @return the number of records updated
		*/
		@Override
		public int setOpportunistic(boolean opportunistic, int subId) {
		public int setOpportunistic(boolean opportunistic, int subId, String callingPackage) {
		try {
		TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
		mContext, subId, callingPackage);
		} catch (SecurityException e) {
		// The subscription may be inactive eSIM profile. If so, check the access rule in
		// database.
		enforceCarrierPrivilegeOnInactiveSub(subId, callingPackage,
		"Caller requires permission on sub " + subId);
		}

		long token = Binder.clearCallingIdentity();
		try {
		return setSubscriptionProperty(subId, SubscriptionManager.IS_OPPORTUNISTIC,
		String.valueOf(opportunistic ? 1 : 0));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		/**
		* Set whether a subscription is metered
		*
		* Throws SecurityException if doesn't have required permission.
		*
		* @param isMetered whether it’s a metered subscription.
		* @param subId the unique SubscriptionInfo index in database
		* @param callingPackage The package making the IPC.
		* @return the number of records updated
		*/
		@Override
		public int setMetered(boolean isMetered, int subId) {
		public int setMetered(boolean isMetered, int subId, String callingPackage) {
		try {
		TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
		mContext, subId, callingPackage);
		} catch (SecurityException e) {
		// The subscription may be inactive eSIM profile. If so, check the access rule in
		// database.
		enforceCarrierPrivilegeOnInactiveSub(subId, callingPackage,
		"Caller requires permission on sub " + subId);
		}

		long token = Binder.clearCallingIdentity();
		try {
		return setSubscriptionProperty(subId, SubscriptionManager.IS_METERED,
		String.valueOf(isMetered ? 1 : 0));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		/**
		* Get subscription info from database, and check whether caller has carrier privilege
		* permission with it. If checking fails, throws SecurityException.
		*/
		private void enforceCarrierPrivilegeOnInactiveSub(int subId, String callingPackage,
		String message) {
		mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);

		SubscriptionManager subManager = (SubscriptionManager)
		mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
		List<SubscriptionInfo> subInfo = getSubInfo(
		SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "=" + subId, null);

		try {
		if (!isActiveSubId(subId) && subInfo != null && subInfo.size() == 1
		&& subManager.canManageSubscription(subInfo.get(0), callingPackage)) {
		return;
		}
		throw new SecurityException(message);
		} catch (IllegalArgumentException e) {
		// canManageSubscription will throw IllegalArgumentException if sub is not embedded
		// or package name is unknown. In this case, we also see it as permission check failure
		// and throw a SecurityException.
		throw new SecurityException(message);
		}
		}

		@Override

tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -156,8 +156,8 @@ public class SubscriptionControllerTest extends TelephonyTest {
		mSubscriptionControllerUT.setDataRoaming(dataRoaming, subID);
		mSubscriptionControllerUT.setDisplayNumber(disNum, subID);
		mSubscriptionControllerUT.setIconTint(iconTint, subID);
		mSubscriptionControllerUT.setOpportunistic(isOpportunistic, subID);
		mSubscriptionControllerUT.setMetered(isMetered, subID);
		mSubscriptionControllerUT.setOpportunistic(isOpportunistic, subID, mCallingPackage);
		mSubscriptionControllerUT.setMetered(isMetered, subID, mCallingPackage);

		subInfo = mSubscriptionControllerUT
		.getActiveSubscriptionInfo(subID, mCallingPackage);
		@@ -390,7 +390,7 @@ public class SubscriptionControllerTest extends TelephonyTest {
		.notifyOpportunisticSubscriptionInfoChanged();

		// Setting sub2 as opportunistic should trigger callback.
		mSubscriptionControllerUT.setOpportunistic(true, 2);
		mSubscriptionControllerUT.setOpportunistic(true, 2, mCallingPackage);

		verify(mTelephonyRegisteryMock, times(1))
		.notifyOpportunisticSubscriptionInfoChanged();