Snap for 5386257 from 0f24b9be64474d2ed575915692ae0fff13531718 to qt-release (bac2af9b) · 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/CellularNetworkService.java

+41 −41

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import android.telephony.CellIdentityLte;
		import android.telephony.CellIdentityTdscdma;
		import android.telephony.CellIdentityWcdma;
		import android.telephony.LteVopsSupportInfo;
		import android.telephony.NetworkRegistrationState;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.NetworkService;
		import android.telephony.NetworkServiceCallback;
		import android.telephony.Rlog;
		@@ -88,9 +88,9 @@ public class CellularNetworkService extends NetworkService {
		if (callback == null) return;
		ar = (AsyncResult) message.obj;
		int domain = (message.what == GET_CS_REGISTRATION_STATE_DONE)
		? NetworkRegistrationState.DOMAIN_CS
		: NetworkRegistrationState.DOMAIN_PS;
		NetworkRegistrationState netState =
		? NetworkRegistrationInfo.DOMAIN_CS
		: NetworkRegistrationInfo.DOMAIN_PS;
		NetworkRegistrationInfo netState =
		getRegistrationStateFromResult(ar.result, domain);

		int resultCode;
		@@ -102,18 +102,18 @@ public class CellularNetworkService extends NetworkService {

		try {
		if (DBG) {
		log("Calling callback.onGetNetworkRegistrationStateComplete."
		log("Calling callback.onGetNetworkRegistrationInfoComplete."
		+ "resultCode = " + resultCode
		+ ", netState = " + netState);
		}
		callback.onGetNetworkRegistrationStateComplete(
		callback.onGetNetworkRegistrationInfoComplete(
		resultCode, netState);
		} catch (Exception e) {
		loge("Exception: " + e);
		}
		break;
		case NETWORK_REGISTRATION_STATE_CHANGED:
		notifyNetworkRegistrationStateChanged();
		notifyNetworkRegistrationInfoChanged();
		break;
		default:
		return;
		@@ -129,22 +129,22 @@ public class CellularNetworkService extends NetworkService {
		switch (halRegState) {
		case RegState.NOT_REG_MT_NOT_SEARCHING_OP:
		case RegState.NOT_REG_MT_NOT_SEARCHING_OP_EM:
		return NetworkRegistrationState.REG_STATE_NOT_REG_NOT_SEARCHING;
		return NetworkRegistrationInfo.REG_STATE_NOT_REG_NOT_SEARCHING;
		case RegState.REG_HOME:
		return NetworkRegistrationState.REG_STATE_HOME;
		return NetworkRegistrationInfo.REG_STATE_HOME;
		case RegState.NOT_REG_MT_SEARCHING_OP:
		case RegState.NOT_REG_MT_SEARCHING_OP_EM:
		return NetworkRegistrationState.REG_STATE_NOT_REG_SEARCHING;
		return NetworkRegistrationInfo.REG_STATE_NOT_REG_SEARCHING;
		case RegState.REG_DENIED:
		case RegState.REG_DENIED_EM:
		return NetworkRegistrationState.REG_STATE_DENIED;
		return NetworkRegistrationInfo.REG_STATE_DENIED;
		case RegState.UNKNOWN:
		case RegState.UNKNOWN_EM:
		return NetworkRegistrationState.REG_STATE_UNKNOWN;
		return NetworkRegistrationInfo.REG_STATE_UNKNOWN;
		case RegState.REG_ROAMING:
		return NetworkRegistrationState.REG_STATE_ROAMING;
		return NetworkRegistrationInfo.REG_STATE_ROAMING;
		default:
		return NetworkRegistrationState.REG_STATE_NOT_REG_NOT_SEARCHING;
		return NetworkRegistrationInfo.REG_STATE_NOT_REG_NOT_SEARCHING;
		}
		}

		@@ -173,16 +173,16 @@ public class CellularNetworkService extends NetworkService {
		// Otherwise, certain services are available only if it's registered on home or roaming
		// network.
		if (emergencyOnly) {
		availableServices = new int[] {NetworkRegistrationState.SERVICE_TYPE_EMERGENCY};
		} else if (regState == NetworkRegistrationState.REG_STATE_ROAMING
		\|\| regState == NetworkRegistrationState.REG_STATE_HOME) {
		if (domain == NetworkRegistrationState.DOMAIN_PS) {
		availableServices = new int[] {NetworkRegistrationState.SERVICE_TYPE_DATA};
		} else if (domain == NetworkRegistrationState.DOMAIN_CS) {
		availableServices = new int[] {NetworkRegistrationInfo.SERVICE_TYPE_EMERGENCY};
		} else if (regState == NetworkRegistrationInfo.REG_STATE_ROAMING
		\|\| regState == NetworkRegistrationInfo.REG_STATE_HOME) {
		if (domain == NetworkRegistrationInfo.DOMAIN_PS) {
		availableServices = new int[] {NetworkRegistrationInfo.SERVICE_TYPE_DATA};
		} else if (domain == NetworkRegistrationInfo.DOMAIN_CS) {
		availableServices = new int[] {
		NetworkRegistrationState.SERVICE_TYPE_VOICE,
		NetworkRegistrationState.SERVICE_TYPE_SMS,
		NetworkRegistrationState.SERVICE_TYPE_VIDEO
		NetworkRegistrationInfo.SERVICE_TYPE_VOICE,
		NetworkRegistrationInfo.SERVICE_TYPE_SMS,
		NetworkRegistrationInfo.SERVICE_TYPE_VIDEO
		};
		}
		}
		@@ -194,24 +194,24 @@ public class CellularNetworkService extends NetworkService {
		return ServiceState.rilRadioTechnologyToNetworkType(rilRat);
		}

		private NetworkRegistrationState getRegistrationStateFromResult(Object result, int domain) {
		private NetworkRegistrationInfo getRegistrationStateFromResult(Object result, int domain) {
		if (result == null) {
		return null;
		}

		// TODO: unify when voiceRegStateResult and DataRegStateResult are unified.
		if (domain == NetworkRegistrationState.DOMAIN_CS) {
		if (domain == NetworkRegistrationInfo.DOMAIN_CS) {
		return createRegistrationStateFromVoiceRegState(result);
		} else if (domain == NetworkRegistrationState.DOMAIN_PS) {
		} else if (domain == NetworkRegistrationInfo.DOMAIN_PS) {
		return createRegistrationStateFromDataRegState(result);
		} else {
		return null;
		}
		}

		private NetworkRegistrationState createRegistrationStateFromVoiceRegState(Object result) {
		private NetworkRegistrationInfo createRegistrationStateFromVoiceRegState(Object result) {
		int transportType = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
		int domain = NetworkRegistrationState.DOMAIN_CS;
		int domain = NetworkRegistrationInfo.DOMAIN_CS;

		if (result instanceof android.hardware.radio.V1_0.VoiceRegStateResult) {
		android.hardware.radio.V1_0.VoiceRegStateResult voiceRegState =
		@@ -229,7 +229,7 @@ public class CellularNetworkService extends NetworkService {
		CellIdentity cellIdentity =
		convertHalCellIdentityToCellIdentity(voiceRegState.cellIdentity);

		return new NetworkRegistrationState(domain, transportType, regState,
		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, cssSupported, roamingIndicator, systemIsInPrl,
		defaultRoamingIndicator);
		@@ -249,7 +249,7 @@ public class CellularNetworkService extends NetworkService {
		CellIdentity cellIdentity =
		convertHalCellIdentityToCellIdentity(voiceRegState.cellIdentity);

		return new NetworkRegistrationState(domain, transportType, regState,
		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, cssSupported, roamingIndicator, systemIsInPrl,
		defaultRoamingIndicator);
		@@ -258,8 +258,8 @@ public class CellularNetworkService extends NetworkService {
		return null;
		}

		private NetworkRegistrationState createRegistrationStateFromDataRegState(Object result) {
		int domain = NetworkRegistrationState.DOMAIN_PS;
		private NetworkRegistrationInfo createRegistrationStateFromDataRegState(Object result) {
		int domain = NetworkRegistrationInfo.DOMAIN_PS;
		int transportType = AccessNetworkConstants.TRANSPORT_TYPE_WWAN;

		if (result instanceof android.hardware.radio.V1_0.DataRegStateResult) {
		@@ -276,7 +276,7 @@ public class CellularNetworkService extends NetworkService {
		LteVopsSupportInfo lteVopsSupportInfo =
		new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
		LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
		return new NetworkRegistrationState(domain, transportType, regState,
		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, maxDataCalls, false /* isDcNrRestricted */,
		false /* isNrAvailable /, false / isEnDcAvailable */, lteVopsSupportInfo);
		@@ -295,7 +295,7 @@ public class CellularNetworkService extends NetworkService {
		LteVopsSupportInfo lteVopsSupportInfo =
		new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
		LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
		return new NetworkRegistrationState(domain, transportType, regState,
		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, maxDataCalls, false /* isDcNrRestricted */,
		false /* isNrAvailable /, false / isEnDcAvailable */, lteVopsSupportInfo);
		@@ -324,7 +324,7 @@ public class CellularNetworkService extends NetworkService {
		LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
		}

		return new NetworkRegistrationState(domain, transportType, regState,
		return new NetworkRegistrationInfo(domain, transportType, regState,
		accessNetworkTechnology, reasonForDenial, emergencyOnly, availableServices,
		cellIdentity, maxDataCalls, nrIndicators.isDcNrRestricted,
		nrIndicators.isNrAvailable, nrIndicators.isEndcAvailable,
		@@ -460,21 +460,21 @@ public class CellularNetworkService extends NetworkService {
		}

		@Override
		public void getNetworkRegistrationState(int domain, NetworkServiceCallback callback) {
		if (DBG) log("getNetworkRegistrationState for domain " + domain);
		public void getNetworkRegistrationInfo(int domain, NetworkServiceCallback callback) {
		if (DBG) log("getNetworkRegistrationInfo for domain " + domain);
		Message message = null;

		if (domain == NetworkRegistrationState.DOMAIN_CS) {
		if (domain == NetworkRegistrationInfo.DOMAIN_CS) {
		message = Message.obtain(mHandler, GET_CS_REGISTRATION_STATE_DONE);
		mCallbackMap.put(message, callback);
		mPhone.mCi.getVoiceRegistrationState(message);
		} else if (domain == NetworkRegistrationState.DOMAIN_PS) {
		} else if (domain == NetworkRegistrationInfo.DOMAIN_PS) {
		message = Message.obtain(mHandler, GET_PS_REGISTRATION_STATE_DONE);
		mCallbackMap.put(message, callback);
		mPhone.mCi.getDataRegistrationState(message);
		} else {
		loge("getNetworkRegistrationState invalid domain " + domain);
		callback.onGetNetworkRegistrationStateComplete(
		loge("getNetworkRegistrationInfo invalid domain " + domain);
		callback.onGetNetworkRegistrationInfoComplete(
		NetworkServiceCallback.RESULT_ERROR_INVALID_ARG, null);
		}
		}

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/NetworkRegistrationManager.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ import android.telephony.AccessNetworkConstants.TransportType;
		import android.telephony.CarrierConfigManager;
		import android.telephony.INetworkService;
		import android.telephony.INetworkServiceCallback;
		import android.telephony.NetworkRegistrationState;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.NetworkService;
		import android.telephony.Rlog;
		import android.telephony.TelephonyManager;
		@@ -127,24 +127,24 @@ public class NetworkRegistrationManager extends Handler {
		return (mINetworkService != null) && (mINetworkService.asBinder().isBinderAlive());
		}

		public void unregisterForNetworkRegistrationStateChanged(Handler h) {
		public void unregisterForNetworkRegistrationInfoChanged(Handler h) {
		mRegStateChangeRegistrants.remove(h);
		}

		public void registerForNetworkRegistrationStateChanged(Handler h, int what, Object obj) {
		logd("registerForNetworkRegistrationStateChanged");
		public void registerForNetworkRegistrationInfoChanged(Handler h, int what, Object obj) {
		logd("registerForNetworkRegistrationInfoChanged");
		mRegStateChangeRegistrants.addUnique(h, what, obj);
		}

		private final Map<NetworkRegStateCallback, Message> mCallbackTable = new Hashtable();

		public void getNetworkRegistrationState(@NetworkRegistrationState.Domain int domain,
		public void getNetworkRegistrationInfo(@NetworkRegistrationInfo.Domain int domain,
		Message onCompleteMessage) {
		if (onCompleteMessage == null) return;

		if (!isServiceConnected()) {
		loge("service not connected. Domain = "
		+ ((domain == NetworkRegistrationState.DOMAIN_CS) ? "CS" : "PS"));
		+ ((domain == NetworkRegistrationInfo.DOMAIN_CS) ? "CS" : "PS"));
		onCompleteMessage.obj = new AsyncResult(onCompleteMessage.obj, null,
		new IllegalStateException("Service not connected."));
		onCompleteMessage.sendToTarget();
		@@ -154,9 +154,9 @@ public class NetworkRegistrationManager extends Handler {
		NetworkRegStateCallback callback = new NetworkRegStateCallback();
		try {
		mCallbackTable.put(callback, onCompleteMessage);
		mINetworkService.getNetworkRegistrationState(mPhone.getPhoneId(), domain, callback);
		mINetworkService.getNetworkRegistrationInfo(mPhone.getPhoneId(), domain, callback);
		} catch (RemoteException e) {
		loge("getNetworkRegistrationState RemoteException " + e);
		loge("getNetworkRegistrationInfo RemoteException " + e);
		mCallbackTable.remove(callback);
		onCompleteMessage.obj = new AsyncResult(onCompleteMessage.obj, null, e);
		onCompleteMessage.sendToTarget();
		@@ -190,7 +190,7 @@ public class NetworkRegistrationManager extends Handler {
		try {
		service.linkToDeath(mDeathRecipient, 0);
		mINetworkService.createNetworkServiceProvider(mPhone.getPhoneId());
		mINetworkService.registerForNetworkRegistrationStateChanged(mPhone.getPhoneId(),
		mINetworkService.registerForNetworkRegistrationInfoChanged(mPhone.getPhoneId(),
		new NetworkRegStateCallback());
		} catch (RemoteException exception) {
		// Remote exception means that the binder already died.
		@@ -213,9 +213,9 @@ public class NetworkRegistrationManager extends Handler {

		private class NetworkRegStateCallback extends INetworkServiceCallback.Stub {
		@Override
		public void onGetNetworkRegistrationStateComplete(
		int result, NetworkRegistrationState state) {
		logd("onGetNetworkRegistrationStateComplete result "
		public void onGetNetworkRegistrationInfoComplete(
		int result, NetworkRegistrationInfo state) {
		logd("onGetNetworkRegistrationInfoComplete result "
		+ result + " state " + state);
		Message onCompleteMessage = mCallbackTable.remove(this);
		if (onCompleteMessage != null) {

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) {
		}

		/**