Merge "support mock carrier privilege rules and apn" (0f24b9be) · Commits · e / os / android_frameworks_opt_telephony

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

+66 −33

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.os.Handler;
		import android.os.Message;
		import android.provider.Telephony;
		import android.service.carrier.CarrierIdentifier;
		import android.telephony.PhoneStateListener;
		import android.telephony.Rlog;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		@@ -81,6 +82,9 @@ public class CarrierResolver extends Handler {
		private String mSpecificCarrierName;
		// cached preferapn name
		private String mPreferApn;
		// override for testing purpose
		private String mTestOverrideApn;
		private String mTestOverrideCarrierPriviledgeRule;
		// cached service provider name. telephonyManager API returns empty string as default value.
		// some carriers need to target devices with Empty SPN. In that case, carrier matching rule
		// should specify "" spn explicitly.
		@@ -169,6 +173,12 @@ public class CarrierResolver extends Handler {
		TelephonyManager.UNKNOWN_CARRIER_ID);
		}

		private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
		@Override
		public void onCallStateChanged(int state, String ignored) {
		}
		};

		/**
		* Entry point for the carrier identification.
		*
		@@ -214,11 +224,13 @@ public class CarrierResolver extends Handler {
		if (mIccRecords != null) {
		logd("Removing stale icc objects.");
		mIccRecords.unregisterForRecordsLoaded(this);
		mIccRecords.unregisterForRecordsOverride(this);
		mIccRecords = null;
		}
		if (newIccRecords != null) {
		logd("new Icc object");
		newIccRecords.registerForRecordsLoaded(this, SIM_LOAD_EVENT, null);
		newIccRecords.registerForRecordsOverride(this, SIM_LOAD_EVENT, null);
		mIccRecords = newIccRecords;
		}
		}
		@@ -319,6 +331,11 @@ public class CarrierResolver extends Handler {
		}

		private String getPreferApn() {
		// return test overrides if present
		if (!TextUtils.isEmpty(mTestOverrideApn)) {
		logd("[getPreferApn]- " + mTestOverrideApn + " test override");
		return mTestOverrideApn;
		}
		Cursor cursor = mContext.getContentResolver().query(
		Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "preferapn/subId/"
		+ mPhone.getSubId()), /* projection */ new String[]{Telephony.Carriers.APN},
		@@ -345,10 +362,52 @@ public class CarrierResolver extends Handler {
		return null;
		}

		public void setTestOverrideApn(String apn) {
		logd("[setTestOverrideApn]: " + apn);
		mTestOverrideApn = apn;
		}

		public void setTestOverrideCarrierPriviledgeRule(String rule) {
		logd("[setTestOverrideCarrierPriviledgeRule]: " + rule);
		mTestOverrideCarrierPriviledgeRule = rule;
		}

		private void updateCarrierIdAndName(int cid, String name,
		int specificCarrierId, String specificCarrierName,
		int mnoCid) {
		boolean update = false;
		if (specificCarrierId != mSpecificCarrierId) {
		logd("[updateSpecificCarrierId] from:" + mSpecificCarrierId + " to:"
		+ specificCarrierId);
		mSpecificCarrierId = specificCarrierId;
		update = true;
		}
		if (specificCarrierName != mSpecificCarrierName) {
		logd("[updateSpecificCarrierName] from:" + mSpecificCarrierName + " to:"
		+ specificCarrierName);
		mSpecificCarrierName = specificCarrierName;
		update = true;
		}
		if (update) {
		mCarrierIdLocalLog.log("[updateSpecificCarrierIdAndName] cid:"
		+ mSpecificCarrierId + " name:" + mSpecificCarrierName);
		final Intent intent = new Intent(TelephonyManager
		.ACTION_SUBSCRIPTION_SPECIFIC_CARRIER_IDENTITY_CHANGED);
		intent.putExtra(TelephonyManager.EXTRA_SPECIFIC_CARRIER_ID, mSpecificCarrierId);
		intent.putExtra(TelephonyManager.EXTRA_SPECIFIC_CARRIER_NAME, mSpecificCarrierName);
		intent.putExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID, mPhone.getSubId());
		mContext.sendBroadcast(intent);

		// notify content observers for specific carrier id change event.
		ContentValues cv = new ContentValues();
		cv.put(CarrierId.SPECIFIC_CARRIER_ID, mSpecificCarrierId);
		cv.put(CarrierId.SPECIFIC_CARRIER_ID_NAME, mSpecificCarrierName);
		mContext.getContentResolver().update(
		Telephony.CarrierId.getSpecificCarrierIdUriForSubscriptionId(mPhone.getSubId()),
		cv, null, null);
		}

		update = false;
		if (!equals(name, mCarrierName, true)) {
		logd("[updateCarrierName] from:" + mCarrierName + " to:" + name);
		mCarrierName = name;
		@@ -385,38 +444,6 @@ public class CarrierResolver extends Handler {
		SubscriptionController.getInstance().setCarrierId(mCarrierId, mPhone.getSubId());
		}
		}

		update = false;
		if (specificCarrierId != mSpecificCarrierId) {
		logd("[updateSpecificCarrierId] from:" + mSpecificCarrierId + " to:"
		+ specificCarrierId);
		mSpecificCarrierId = specificCarrierId;
		update = true;
		}
		if (specificCarrierName != mSpecificCarrierName) {
		logd("[updateSpecificCarrierName] from:" + mSpecificCarrierName + " to:"
		+ specificCarrierName);
		mSpecificCarrierName = specificCarrierName;
		update = true;
		}
		if (update) {
		mCarrierIdLocalLog.log("[updateSpecificCarrierIdAndName] cid:"
		+ mSpecificCarrierId + " name:" + mSpecificCarrierName);
		final Intent intent = new Intent(TelephonyManager
		.ACTION_SUBSCRIPTION_SPECIFIC_CARRIER_IDENTITY_CHANGED);
		intent.putExtra(TelephonyManager.EXTRA_SPECIFIC_CARRIER_ID, mSpecificCarrierId);
		intent.putExtra(TelephonyManager.EXTRA_SPECIFIC_CARRIER_NAME, mSpecificCarrierName);
		intent.putExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID, mPhone.getSubId());
		mContext.sendBroadcast(intent);

		// notify content observers for specific carrier id change event.
		ContentValues cv = new ContentValues();
		cv.put(CarrierId.SPECIFIC_CARRIER_ID, mSpecificCarrierId);
		cv.put(CarrierId.SPECIFIC_CARRIER_ID_NAME, mSpecificCarrierName);
		mContext.getContentResolver().update(
		Telephony.CarrierId.getSpecificCarrierIdUriForSubscriptionId(mPhone.getSubId()),
		cv, null, null);
		}
		}

		private static CarrierMatchingRule makeCarrierMatchingRule(Cursor cursor) {
		@@ -663,7 +690,13 @@ public class CarrierResolver extends Handler {
		final String plmn = mPhone.getPlmn();
		final String spn = mSpn;
		final String apn = mPreferApn;
		final List<String> accessRules = mTelephonyMgr.getCertsFromCarrierPrivilegeAccessRules();
		List<String> accessRules;
		// check if test override present
		if (!TextUtils.isEmpty(mTestOverrideCarrierPriviledgeRule)) {
		accessRules = new ArrayList<>(Arrays.asList(mTestOverrideCarrierPriviledgeRule));
		} else {
		accessRules = mTelephonyMgr.getCertsFromCarrierPrivilegeAccessRules();
		}

		if (VDBG) {
		logd("[matchSubscriptionCarrier]"

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -1700,7 +1700,9 @@ public class GsmCdmaPhone extends Phone {

		@Override
		public void setCarrierTestOverride(String mccmnc, String imsi, String iccid, String gid1,
		String gid2, String pnn, String spn) {
		String gid2, String pnn, String spn, String carrierPrivilegeRules, String apn) {
		mCarrierResolver.setTestOverrideApn(apn);
		mCarrierResolver.setTestOverrideCarrierPriviledgeRule(carrierPrivilegeRules);
		IccRecords r = null;
		if (isPhoneTypeGsm()) {
		r = mIccRecords.get();

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3929,7 +3929,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		}

		public void setCarrierTestOverride(String mccmnc, String imsi, String iccid, String gid1,
		String gid2, String pnn, String spn) {
		String gid2, String pnn, String spn, String carrierPrivilegeRules, String apn) {
		}

		/**

src/java/com/android/internal/telephony/uicc/IccRecords.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ public abstract class IccRecords extends Handler implements IccConstants {
		protected RegistrantList mNewSmsRegistrants = new RegistrantList();
		protected RegistrantList mNetworkSelectionModeAutomaticRegistrants = new RegistrantList();
		protected RegistrantList mSpnUpdatedRegistrants = new RegistrantList();
		protected RegistrantList mRecordsOverrideRegistrants = new RegistrantList();

		@UnsupportedAppUsage
		protected int mRecordsToLoad; // number of pending load requests
		@@ -263,7 +264,7 @@ public abstract class IccRecords extends Handler implements IccConstants {
		mCarrierTestOverride.override(mccmnc, imsi, iccid, gid1, gid2, pnn, spn);
		mTelephonyManager.setSimOperatorNameForPhone(mParentApp.getPhoneId(), spn);
		mTelephonyManager.setSimOperatorNumericForPhone(mParentApp.getPhoneId(), mccmnc);
		mRecordsLoadedRegistrants.notifyRegistrants();
		mRecordsOverrideRegistrants.notifyRegistrants();
		}

		/**
		@@ -360,6 +361,23 @@ public abstract class IccRecords extends Handler implements IccConstants {
		mRecordsLoadedRegistrants.remove(h);
		}

		public void unregisterForRecordsOverride(Handler h) {
		mRecordsOverrideRegistrants.remove(h);
		}

		public void registerForRecordsOverride(Handler h, int what, Object obj) {
		if (mDestroyed.get()) {
		return;
		}

		Registrant r = new Registrant(h, what, obj);
		mRecordsOverrideRegistrants.add(r);

		if (getRecordsLoaded()) {
		r.notifyRegistrant(new AsyncResult(null, null, null));
		}
		}

		/**
		* Register to be notified when records are loaded for a PIN or PUK locked SIM
		*/