am db81ecd2: am 4084e108: Reverting change which uses spnoverride to set ONS. (f85c798a) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −11

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,6 @@ import com.android.internal.telephony.uicc.IccCardStatus;
	import com.android.internal.telephony.uicc.IccIoResult;		import com.android.internal.telephony.uicc.IccIoResult;
	import com.android.internal.telephony.uicc.IccRefreshResponse;		import com.android.internal.telephony.uicc.IccRefreshResponse;
	import com.android.internal.telephony.uicc.IccUtils;		import com.android.internal.telephony.uicc.IccUtils;
	import com.android.internal.telephony.uicc.SpnOverride;
	import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;		import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
	import com.android.internal.telephony.cdma.CdmaInformationRecords;		import com.android.internal.telephony.cdma.CdmaInformationRecords;
	import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;		import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;
	@@ -3608,9 +3607,6 @@ public final class RIL extends BaseCommands implements CommandsInterface {
	String strings[] = (String [])responseStrings(p);		String strings[] = (String [])responseStrings(p);
	ArrayList<OperatorInfo> ret;		ArrayList<OperatorInfo> ret;

	// FIXME: What is this really doing
	SpnOverride spnOverride = new SpnOverride();

	if (strings.length % 4 != 0) {		if (strings.length % 4 != 0) {
	throw new RuntimeException(		throw new RuntimeException(
	"RIL_REQUEST_QUERY_AVAILABLE_NETWORKS: invalid response. Got "		"RIL_REQUEST_QUERY_AVAILABLE_NETWORKS: invalid response. Got "
	@@ -3620,15 +3616,9 @@ public final class RIL extends BaseCommands implements CommandsInterface {
	ret = new ArrayList<OperatorInfo>(strings.length / 4);		ret = new ArrayList<OperatorInfo>(strings.length / 4);

	for (int i = 0 ; i < strings.length ; i += 4) {		for (int i = 0 ; i < strings.length ; i += 4) {
	String strOperatorLong = null;
	if (spnOverride.containsCarrier(strings[i+2])) {
	strOperatorLong = spnOverride.getSpn(strings[i+2]);
	} else {
	strOperatorLong = strings[i+0];
	}
	ret.add (		ret.add (
	new OperatorInfo(		new OperatorInfo(
	strOperatorLong,		strings[i+0],
	strings[i+1],		strings[i+1],
	strings[i+2],		strings[i+2],
	strings[i+3]));		strings[i+3]));

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+1 −13

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,6 @@ import com.android.internal.telephony.dataconnection.DcTrackerBase;
	import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;		import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppState;
	import com.android.internal.telephony.uicc.IccRecords;		import com.android.internal.telephony.uicc.IccRecords;
	import com.android.internal.telephony.uicc.SIMRecords;		import com.android.internal.telephony.uicc.SIMRecords;
	import com.android.internal.telephony.uicc.SpnOverride;
	import com.android.internal.telephony.uicc.UiccCard;		import com.android.internal.telephony.uicc.UiccCard;
	import com.android.internal.telephony.uicc.UiccCardApplication;		import com.android.internal.telephony.uicc.UiccCardApplication;
	import com.android.internal.telephony.uicc.UiccController;		import com.android.internal.telephony.uicc.UiccController;
	@@ -98,7 +97,6 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
	private GSMPhone mPhone;		private GSMPhone mPhone;
	GsmCellLocation mCellLoc;		GsmCellLocation mCellLoc;
	GsmCellLocation mNewCellLoc;		GsmCellLocation mNewCellLoc;
	SpnOverride mSpnOverride;
	int mPreferredNetworkType;		int mPreferredNetworkType;

	private int mMaxDataCalls = 1;		private int mMaxDataCalls = 1;
	@@ -226,7 +224,6 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
	mPhone = phone;		mPhone = phone;
	mCellLoc = new GsmCellLocation();		mCellLoc = new GsmCellLocation();
	mNewCellLoc = new GsmCellLocation();		mNewCellLoc = new GsmCellLocation();
	mSpnOverride = new SpnOverride();

	PowerManager powerManager =		PowerManager powerManager =
	(PowerManager)phone.getContext().getSystemService(Context.POWER_SERVICE);		(PowerManager)phone.getContext().getSystemService(Context.POWER_SERVICE);
	@@ -816,16 +813,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
	log("EVENT_POLL_STATE_OPERATOR: use brandOverride=" + brandOverride);		log("EVENT_POLL_STATE_OPERATOR: use brandOverride=" + brandOverride);
	mNewSS.setOperatorName(brandOverride, brandOverride, opNames[2]);		mNewSS.setOperatorName(brandOverride, brandOverride, opNames[2]);
	} else {		} else {
	String strOperatorLong = null;		mNewSS.setOperatorName (opNames[0], opNames[1], opNames[2]);
	if (mSpnOverride.containsCarrier(opNames[2])) {
	log("EVENT_POLL_STATE_OPERATOR: use spnOverride");
	strOperatorLong = mSpnOverride.getSpn(opNames[2]);
	} else {
	log("EVENT_POLL_STATE_OPERATOR: use value from ril");
	strOperatorLong = opNames[0];
	}
	log("EVENT_POLL_STATE_OPERATOR: " + strOperatorLong);
	mNewSS.setOperatorName (strOperatorLong, opNames[1], opNames[2]);
	}		}
	}		}
	break;		break;

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -39,16 +39,16 @@ public class SpnOverride {
	static final String PARTNER_SPN_OVERRIDE_PATH ="etc/spn-conf.xml";		static final String PARTNER_SPN_OVERRIDE_PATH ="etc/spn-conf.xml";
	static final String OEM_SPN_OVERRIDE_PATH = "telephony/spn-conf.xml";		static final String OEM_SPN_OVERRIDE_PATH = "telephony/spn-conf.xml";

	public SpnOverride () {		SpnOverride () {
	mCarrierSpnMap = new HashMap<String, String>();		mCarrierSpnMap = new HashMap<String, String>();
	loadSpnOverrides();		loadSpnOverrides();
	}		}

	public boolean containsCarrier(String carrier) {		boolean containsCarrier(String carrier) {
	return mCarrierSpnMap.containsKey(carrier);		return mCarrierSpnMap.containsKey(carrier);
	}		}

	public String getSpn(String carrier) {		String getSpn(String carrier) {
	return mCarrierSpnMap.get(carrier);		return mCarrierSpnMap.get(carrier);
	}		}