Allow carrier-privileged apps to access Telephony/Subscription APIs. (4d42d689) · Commits · e / os / android_frameworks_opt_telephony

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

+17 −16

Original line number	Original line	Diff line number	Diff line
	@@ -60,15 +60,15 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	}		}

	public String getDeviceIdForPhone(int phoneId, String callingPackage) {		public String getDeviceIdForPhone(int phoneId, String callingPackage) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getDeviceId")) {
	return null;
	}
	if (!SubscriptionManager.isValidPhoneId(phoneId)) {		if (!SubscriptionManager.isValidPhoneId(phoneId)) {
	phoneId = 0;		phoneId = 0;
	}		}
	final Phone phone = mPhone[phoneId];		final Phone phone = mPhone[phoneId];
	if (phone != null) {		if (phone != null) {
			if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
			mContext, phone.getSubId(), callingPackage, "getDeviceId")) {
			return null;
			}
	return phone.getDeviceId();		return phone.getDeviceId();
	} else {		} else {
	loge("getDeviceIdForPhone phone " + phoneId + " is null");		loge("getDeviceIdForPhone phone " + phoneId + " is null");
	@@ -80,7 +80,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getNai")) {		mContext, subId, callingPackage, "getNai")) {
	return null;		return null;
	}		}
	return phone.getNai();		return phone.getNai();
	@@ -94,7 +94,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getImei")) {		mContext, subId, callingPackage, "getImei")) {
	return null;		return null;
	}		}
	return phone.getImei();		return phone.getImei();
	@@ -109,7 +109,8 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getCarrierInfoForImsiEncryption")) {		mContext, subId, callingPackage,
			"getCarrierInfoForImsiEncryption")) {
	return null;		return null;
	}		}
	return phone.getCarrierInfoForImsiEncryption(keyType);		return phone.getCarrierInfoForImsiEncryption(keyType);
	@@ -159,7 +160,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getDeviceSvn")) {		mContext, subId, callingPackage, "getDeviceSvn")) {
	return null;		return null;
	}		}
	return phone.getDeviceSvn();		return phone.getDeviceSvn();
	@@ -177,7 +178,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getSubscriberId")) {		mContext, subId, callingPackage, "getSubscriberId")) {
	return null;		return null;
	}		}
	return phone.getSubscriberId();		return phone.getSubscriberId();
	@@ -198,7 +199,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getIccSerialNumber")) {		mContext, subId, callingPackage, "getIccSerialNumber")) {
	return null;		return null;
	}		}
	return phone.getIccSerialNumber();		return phone.getIccSerialNumber();
	@@ -217,7 +218,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	if (phone != null) {		if (phone != null) {
	// This is open to apps with WRITE_SMS.		// This is open to apps with WRITE_SMS.
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneNumber(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneNumber(
	mContext, callingPackage, "getLine1Number")) {		mContext, subId, callingPackage, "getLine1Number")) {
	return null;		return null;
	}		}
	return phone.getLine1Number();		return phone.getLine1Number();
	@@ -235,7 +236,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getLine1AlphaTag")) {		mContext, subId, callingPackage, "getLine1AlphaTag")) {
	return null;		return null;
	}		}
	return phone.getLine1AlphaTag();		return phone.getLine1AlphaTag();
	@@ -253,7 +254,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getMsisdn")) {		mContext, subId, callingPackage, "getMsisdn")) {
	return null;		return null;
	}		}
	return phone.getMsisdn();		return phone.getMsisdn();
	@@ -271,7 +272,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getVoiceMailNumber")) {		mContext, subId, callingPackage, "getVoiceMailNumber")) {
	return null;		return null;
	}		}
	String number = PhoneNumberUtils.extractNetworkPortion(phone.getVoiceMailNumber());		String number = PhoneNumberUtils.extractNetworkPortion(phone.getVoiceMailNumber());
	@@ -309,7 +310,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getVoiceMailAlphaTag")) {		mContext, subId, callingPackage, "getVoiceMailAlphaTag")) {
	return null;		return null;
	}		}
	return phone.getVoiceMailAlphaTag();		return phone.getVoiceMailAlphaTag();
	@@ -498,7 +499,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
	Phone phone = getPhone(subId);		Phone phone = getPhone(subId);
	if (phone != null) {		if (phone != null) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getGroupIdLevel1")) {		mContext, subId, callingPackage, "getGroupIdLevel1")) {
	return null;		return null;
	}		}
	return phone.getGroupIdLevel1();		return phone.getGroupIdLevel1();

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

+110 −73

Original line number	Original line	Diff line number	Diff line
	@@ -418,7 +418,7 @@ public class SubscriptionController extends ISub.Stub {
	@Override		@Override
	public SubscriptionInfo getActiveSubscriptionInfo(int subId, String callingPackage) {		public SubscriptionInfo getActiveSubscriptionInfo(int subId, String callingPackage) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getActiveSubscriptionInfo")) {		mContext, subId, callingPackage, "getActiveSubscriptionInfo")) {
	return null;		return null;
	}		}

	@@ -457,12 +457,29 @@ public class SubscriptionController extends ISub.Stub {
	*/		*/
	@Override		@Override
	public SubscriptionInfo getActiveSubscriptionInfoForIccId(String iccId, String callingPackage) {		public SubscriptionInfo getActiveSubscriptionInfoForIccId(String iccId, String callingPackage) {
			// Query the subscriptions unconditionally, and then check whether the caller has access to
			// the given subscription.
			final SubscriptionInfo si = getActiveSubscriptionInfoForIccIdInternal(iccId);

			final int subId = si != null
			? si.getSubscriptionId() : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getActiveSubscriptionInfoForIccId") \|\| iccId == null) {		mContext, subId, callingPackage, "getActiveSubscriptionInfoForIccId")) {
			return null;
			}

			return si;
			}

			/**
			* Get the active SubscriptionInfo associated with the given iccId. The caller must perform
			* permission checks when using this method.
			*/
			private SubscriptionInfo getActiveSubscriptionInfoForIccIdInternal(String iccId) {
			if (iccId == null) {
	return null;		return null;
	}		}

	// Now that all security checks passes, perform the operation as ourselves.
	final long identity = Binder.clearCallingIdentity();		final long identity = Binder.clearCallingIdentity();
	try {		try {
	List<SubscriptionInfo> subList = getActiveSubscriptionInfoList(		List<SubscriptionInfo> subList = getActiveSubscriptionInfoList(
	@@ -496,8 +513,16 @@ public class SubscriptionController extends ISub.Stub {
	@Override		@Override
	public SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int slotIndex,		public SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int slotIndex,
	String callingPackage) {		String callingPackage) {
			Phone phone = PhoneFactory.getPhone(slotIndex);
			if (phone == null) {
			if (DBG) {
			loge("[getActiveSubscriptionInfoForSimSlotIndex] no phone, slotIndex=" + slotIndex);
			}
			return null;
			}
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getActiveSubscriptionInfoForSimSlotIndex")) {		mContext, phone.getSubId(), callingPackage,
			"getActiveSubscriptionInfoForSimSlotIndex")) {
	return null;		return null;
	}		}

	@@ -542,8 +567,11 @@ public class SubscriptionController extends ISub.Stub {
	public List<SubscriptionInfo> getAllSubInfoList(String callingPackage) {		public List<SubscriptionInfo> getAllSubInfoList(String callingPackage) {
	if (DBG) logd("[getAllSubInfoList]+");		if (DBG) logd("[getAllSubInfoList]+");

			// This API isn't public, so no need to provide a valid subscription ID - we're not worried
			// about carrier-privileged callers not having access.
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getAllSubInfoList")) {		mContext, SubscriptionManager.INVALID_SUBSCRIPTION_ID, callingPackage,
			"getAllSubInfoList")) {
	return null;		return null;
	}		}

	@@ -570,13 +598,19 @@ public class SubscriptionController extends ISub.Stub {
	*/		*/
	@Override		@Override
	public List<SubscriptionInfo> getActiveSubscriptionInfoList(String callingPackage) {		public List<SubscriptionInfo> getActiveSubscriptionInfoList(String callingPackage) {
			boolean canReadAllPhoneState;
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		try {
	mContext, callingPackage, "getActiveSubscriptionInfoList")) {		canReadAllPhoneState = TelephonyPermissions.checkReadPhoneState(mContext,
	return null;		SubscriptionManager.INVALID_SUBSCRIPTION_ID, Binder.getCallingPid(),
			Binder.getCallingUid(), callingPackage, "getActiveSubscriptionInfoList");
			} catch (SecurityException e) {
			canReadAllPhoneState = false;
	}		}

	// Now that all security checks passes, perform the operation as ourselves.		// Perform the operation as ourselves. If the caller cannot read phone state, they may still
			// have carrier privileges for that subscription, so we always need to make the query and
			// then filter the results.
			List<SubscriptionInfo> subList;
	final long identity = Binder.clearCallingIdentity();		final long identity = Binder.clearCallingIdentity();
	try {		try {
	if (!isSubInfoReady()) {		if (!isSubInfoReady()) {
	@@ -592,7 +626,7 @@ public class SubscriptionController extends ISub.Stub {
	logd("[getActiveSubscriptionInfoList] Getting Cached subInfo=" + si);		logd("[getActiveSubscriptionInfoList] Getting Cached subInfo=" + si);
	}		}
	}		}
	return new ArrayList<SubscriptionInfo>(tmpCachedSubList);		subList = tmpCachedSubList;
	} else {		} else {
	if (DBG_CACHE) {		if (DBG_CACHE) {
	logd("[getActiveSubscriptionInfoList] Cached subInfo is null");		logd("[getActiveSubscriptionInfoList] Cached subInfo is null");
	@@ -602,6 +636,24 @@ public class SubscriptionController extends ISub.Stub {
	} finally {		} finally {
	Binder.restoreCallingIdentity(identity);		Binder.restoreCallingIdentity(identity);
	}		}

			// If the caller can read all phone state, just return the full list.
			if (canReadAllPhoneState) {
			return new ArrayList<>(subList);
			}

			// Filter the list to only include subscriptions which the (restored) caller can manage.
			return subList.stream()
			.filter(subscriptionInfo -> {
			try {
			return TelephonyPermissions.checkCallingOrSelfReadPhoneState(mContext,
			subscriptionInfo.getSubscriptionId(), callingPackage,
			"getActiveSubscriptionInfoList");
			} catch (SecurityException e) {
			return false;
			}
			})
			.collect(Collectors.toList());
	}		}

	/**		/**
	@@ -655,25 +707,14 @@ public class SubscriptionController extends ISub.Stub {
	*/		*/
	@Override		@Override
	public int getActiveSubInfoCount(String callingPackage) {		public int getActiveSubInfoCount(String callingPackage) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		// Let getActiveSubscriptionInfoList perform permission checks / filtering.
	mContext, callingPackage, "getActiveSubInfoCount")) {		List<SubscriptionInfo> records = getActiveSubscriptionInfoList(callingPackage);
	return 0;
	}

	// Now that all security checks passes, perform the operation as ourselves.
	final long identity = Binder.clearCallingIdentity();
	try {
	List<SubscriptionInfo> records = getActiveSubscriptionInfoList(
	mContext.getOpPackageName());
	if (records == null) {		if (records == null) {
	if (VDBG) logd("[getActiveSubInfoCount] records null");		if (VDBG) logd("[getActiveSubInfoCount] records null");
	return 0;		return 0;
	}		}
	if (VDBG) logd("[getActiveSubInfoCount]- count: " + records.size());		if (VDBG) logd("[getActiveSubInfoCount]- count: " + records.size());
	return records.size();		return records.size();
	} finally {
	Binder.restoreCallingIdentity(identity);
	}
	}		}

	/**		/**
	@@ -685,8 +726,11 @@ public class SubscriptionController extends ISub.Stub {
	public int getAllSubInfoCount(String callingPackage) {		public int getAllSubInfoCount(String callingPackage) {
	if (DBG) logd("[getAllSubInfoCount]+");		if (DBG) logd("[getAllSubInfoCount]+");

			// This API isn't public, so no need to provide a valid subscription ID - we're not worried
			// about carrier-privileged callers not having access.
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getAllSubInfoCount")) {		mContext, SubscriptionManager.INVALID_SUBSCRIPTION_ID, callingPackage,
			"getAllSubInfoCount")) {
	return 0;		return 0;
	}		}

	@@ -725,8 +769,11 @@ public class SubscriptionController extends ISub.Stub {

	@Override		@Override
	public List<SubscriptionInfo> getAvailableSubscriptionInfoList(String callingPackage) {		public List<SubscriptionInfo> getAvailableSubscriptionInfoList(String callingPackage) {
			// This API isn't public, so no need to provide a valid subscription ID - we're not worried
			// about carrier-privileged callers not having access.
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getAvailableSubscriptionInfoList")) {		mContext, SubscriptionManager.INVALID_SUBSCRIPTION_ID, callingPackage,
			"getAvailableSubscriptionInfoList")) {
	throw new SecurityException("Need READ_PHONE_STATE to call "		throw new SecurityException("Need READ_PHONE_STATE to call "
	+ " getAvailableSubscriptionInfoList");		+ " getAvailableSubscriptionInfoList");
	}		}
	@@ -1862,28 +1909,21 @@ public class SubscriptionController extends ISub.Stub {
	return subIds[0];		return subIds[0];
	}		}

	public List<SubscriptionInfo> getSubInfoUsingSlotIndexWithCheck(int slotIndex,		/** Must be public for access from instrumentation tests. */
	boolean needCheck,		@VisibleForTesting
	String callingPackage) {		public List<SubscriptionInfo> getSubInfoUsingSlotIndexPrivileged(int slotIndex,
	if (DBG) logd("[getSubInfoUsingSlotIndexWithCheck]+ slotIndex:" + slotIndex);		boolean needCheck) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (DBG) logd("[getSubInfoUsingSlotIndexPrivileged]+ slotIndex:" + slotIndex);
	mContext, callingPackage, "getSubInfoUsingSlotIndexWithCheck")) {
	return null;
	}

	// Now that all security checks passes, perform the operation as ourselves.
	final long identity = Binder.clearCallingIdentity();
	try {
	if (slotIndex == SubscriptionManager.DEFAULT_SIM_SLOT_INDEX) {		if (slotIndex == SubscriptionManager.DEFAULT_SIM_SLOT_INDEX) {
	slotIndex = getSlotIndex(getDefaultSubId());		slotIndex = getSlotIndex(getDefaultSubId());
	}		}
	if (!SubscriptionManager.isValidSlotIndex(slotIndex)) {		if (!SubscriptionManager.isValidSlotIndex(slotIndex)) {
	if (DBG) logd("[getSubInfoUsingSlotIndexWithCheck]- invalid slotIndex");		if (DBG) logd("[getSubInfoUsingSlotIndexPrivileged]- invalid slotIndex");
	return null;		return null;
	}		}

	if (needCheck && !isSubInfoReady()) {		if (needCheck && !isSubInfoReady()) {
	if (DBG) logd("[getSubInfoUsingSlotIndexWithCheck]- not ready");		if (DBG) logd("[getSubInfoUsingSlotIndexPrivileged]- not ready");
	return null;		return null;
	}		}

	@@ -1911,9 +1951,6 @@ public class SubscriptionController extends ISub.Stub {
	if (DBG) logd("[getSubInfoUsingSlotIndex]- null info return");		if (DBG) logd("[getSubInfoUsingSlotIndex]- null info return");

	return subList;		return subList;
	} finally {
	Binder.restoreCallingIdentity(identity);
	}
	}		}

	private void validateSubId(int subId) {		private void validateSubId(int subId) {
	@@ -2059,7 +2096,7 @@ public class SubscriptionController extends ISub.Stub {
	@Override		@Override
	public String getSubscriptionProperty(int subId, String propKey, String callingPackage) {		public String getSubscriptionProperty(int subId, String propKey, String callingPackage) {
	if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(		if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
	mContext, callingPackage, "getSubInfoUsingSlotIndexWithCheck")) {		mContext, subId, callingPackage, "getSubscriptionProperty")) {
	return null;		return null;
	}		}
	String resultValue = null;		String resultValue = null;

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

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -571,9 +571,8 @@ public class SubscriptionInfoUpdater extends Handler {
	String[] decIccId = new String[PROJECT_SIM_NUM];		String[] decIccId = new String[PROJECT_SIM_NUM];
	for (int i = 0; i < PROJECT_SIM_NUM; i++) {		for (int i = 0; i < PROJECT_SIM_NUM; i++) {
	oldIccId[i] = null;		oldIccId[i] = null;
	List<SubscriptionInfo> oldSubInfo =		List<SubscriptionInfo> oldSubInfo = SubscriptionController.getInstance()
	SubscriptionController.getInstance().getSubInfoUsingSlotIndexWithCheck(i, false,		.getSubInfoUsingSlotIndexPrivileged(i, false);
	mContext.getOpPackageName());
	decIccId[i] = IccUtils.getDecimalSubstring(mIccId[i]);		decIccId[i] = IccUtils.getDecimalSubstring(mIccId[i]);
	if (oldSubInfo != null && oldSubInfo.size() > 0) {		if (oldSubInfo != null && oldSubInfo.size() > 0) {
	oldIccId[i] = oldSubInfo.get(0).getIccId();		oldIccId[i] = oldSubInfo.get(0).getIccId();

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

+29 −29

Original line number	Original line	Diff line number	Diff line
	@@ -15,15 +15,10 @@
	*/		*/
	package com.android.internal.telephony;		package com.android.internal.telephony;

	import android.app.AppOpsManager;
	import android.content.Context;
	import org.junit.After;
	import org.junit.Assert;
	import org.junit.Before;

	import static android.Manifest.permission.READ_PHONE_STATE;		import static android.Manifest.permission.READ_PHONE_STATE;
	import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;		import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;
	import static android.Manifest.permission.READ_SMS;		import static android.Manifest.permission.READ_SMS;

	import static org.junit.Assert.assertEquals;		import static org.junit.Assert.assertEquals;
	import static org.junit.Assert.assertNull;		import static org.junit.Assert.assertNull;
	import static org.junit.Assert.assertTrue;		import static org.junit.Assert.assertTrue;
	@@ -31,12 +26,17 @@ import static org.mockito.Matchers.anyInt;
	import static org.mockito.Mockito.anyString;		import static org.mockito.Mockito.anyString;
	import static org.mockito.Mockito.doReturn;		import static org.mockito.Mockito.doReturn;
	import static org.mockito.Mockito.eq;		import static org.mockito.Mockito.eq;
	import org.junit.Test;
	import org.mockito.Mock;


			import android.app.AppOpsManager;
			import android.content.Context;
	import android.test.suitebuilder.annotation.SmallTest;		import android.test.suitebuilder.annotation.SmallTest;

			import org.junit.After;
			import org.junit.Assert;
			import org.junit.Before;
			import org.junit.Test;
			import org.mockito.Mock;

	public class PhoneSubInfoControllerTest extends TelephonyTest {		public class PhoneSubInfoControllerTest extends TelephonyTest {
	private PhoneSubInfoController mPhoneSubInfoControllerUT;		private PhoneSubInfoController mPhoneSubInfoControllerUT;
	private AppOpsManager mAppOsMgr;		private AppOpsManager mAppOsMgr;
	@@ -92,7 +92,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getDeviceId", ex.getMessage());		assertTrue(ex.getMessage().contains("getDeviceId"));
	}		}

	try {		try {
	@@ -100,7 +100,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getDeviceId", ex.getMessage());		assertTrue(ex.getMessage().contains("getDeviceId"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -142,7 +142,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getNai", ex.getMessage());		assertTrue(ex.getMessage().contains("getNai"));
	}		}

	try {		try {
	@@ -150,7 +150,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getNai", ex.getMessage());		assertTrue(ex.getMessage().contains("getNai"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -192,7 +192,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getImei", ex.getMessage());		assertTrue(ex.getMessage().contains("getImei"));
	}		}

	try {		try {
	@@ -200,7 +200,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getImei", ex.getMessage());		assertTrue(ex.getMessage().contains("getImei"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -242,7 +242,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getDeviceSvn", ex.getMessage());		assertTrue(ex.getMessage().contains("getDeviceSvn"));
	}		}

	try {		try {
	@@ -250,7 +250,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getDeviceSvn", ex.getMessage());		assertTrue(ex.getMessage().contains("getDeviceSvn"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -295,7 +295,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getSubscriberId", ex.getMessage());		assertTrue(ex.getMessage().contains("getSubscriberId"));
	}		}

	try {		try {
	@@ -303,7 +303,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getSubscriberId", ex.getMessage());		assertTrue(ex.getMessage().contains("getSubscriberId"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -350,7 +350,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getIccSerialNumber", ex.getMessage());		assertTrue(ex.getMessage().contains("getIccSerialNumber"));
	}		}

	try {		try {
	@@ -358,7 +358,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getIccSerialNumber", ex.getMessage());		assertTrue(ex.getMessage().contains("getIccSerialNumber"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -483,7 +483,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getLine1AlphaTag", ex.getMessage());		assertTrue(ex.getMessage().contains("getLine1AlphaTag"));
	}		}

	try {		try {
	@@ -491,7 +491,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getLine1AlphaTag", ex.getMessage());		assertTrue(ex.getMessage().contains("getLine1AlphaTag"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -535,7 +535,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getMsisdn", ex.getMessage());		assertTrue(ex.getMessage().contains("getMsisdn"));
	}		}

	try {		try {
	@@ -543,7 +543,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getMsisdn", ex.getMessage());		assertTrue(ex.getMessage().contains("getMsisdn"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -587,7 +587,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getVoiceMailNumber", ex.getMessage());		assertTrue(ex.getMessage().contains("getVoiceMailNumber"));
	}		}

	try {		try {
	@@ -595,7 +595,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getVoiceMailNumber", ex.getMessage());		assertTrue(ex.getMessage().contains("getVoiceMailNumber"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION
	@@ -641,7 +641,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getVoiceMailAlphaTag", ex.getMessage());		assertTrue(ex.getMessage().contains("getVoiceMailAlphaTag"));
	}		}

	try {		try {
	@@ -649,7 +649,7 @@ public class PhoneSubInfoControllerTest extends TelephonyTest {
	Assert.fail("expected Security Exception Thrown");		Assert.fail("expected Security Exception Thrown");
	} catch (Exception ex) {		} catch (Exception ex) {
	assertTrue(ex instanceof SecurityException);		assertTrue(ex instanceof SecurityException);
	assertEquals(READ_PHONE_STATE + " denied: getVoiceMailAlphaTag", ex.getMessage());		assertTrue(ex.getMessage().contains("getVoiceMailAlphaTag"));
	}		}

	//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION		//case 2: no READ_PRIVILEGED_PHONE_STATE & appOsMgr READ_PHONE_PERMISSION

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

+6 −6

File changed.

Preview size limit exceeded, changes collapsed.