Merge "Check permission for SubscriptionController.isActiveSubId" am: bd394035b9 (bd7c5f2f) · Commits · e / os / android_frameworks_opt_telephony

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -1954,6 +1954,20 @@ public class SubscriptionController extends ISub.Stub {
		}

		@Override
		public boolean isActiveSubId(int subId, String callingPackage) {
		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(mContext, subId, callingPackage,
		"isActiveSubId")) {
		throw new SecurityException("Requires READ_PHONE_STATE permission.");
		}
		final long identity = Binder.clearCallingIdentity();
		try {
		return isActiveSubId(subId);
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}

		@Deprecated // This should be moved into isActiveSubId(int, String)
		public boolean isActiveSubId(int subId) {
		boolean retVal = SubscriptionManager.isValidSubscriptionId(subId)
		&& getActiveSubIdArrayList().contains(subId);