Merge "Revert "Add Radio Tech support when search PLMN"" (ecf7fd34) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/OperatorInfo.java

+1 −19

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ public class OperatorInfo implements Parcelable {
		private String mOperatorAlphaLong;
		private String mOperatorAlphaShort;
		private String mOperatorNumeric;
		private String mRadioTech;

		private State mState = State.UNKNOWN;

		@@ -58,11 +57,6 @@ public class OperatorInfo implements Parcelable {
		return mState;
		}

		public String
		getRadioTech() {
		return mRadioTech;
		}

		OperatorInfo(String operatorAlphaLong,
		String operatorAlphaShort,
		String operatorNumeric,
		@@ -71,14 +65,6 @@ public class OperatorInfo implements Parcelable {
		mOperatorAlphaLong = operatorAlphaLong;
		mOperatorAlphaShort = operatorAlphaShort;
		mOperatorNumeric = operatorNumeric;
		mRadioTech = "";
		/* operatorNumeric format: PLMN+RAT or PLMN */
		if (null != operatorNumeric) {
		String values[] = operatorNumeric.split("\\+");
		mOperatorNumeric = values[0];
		if (values.length > 1)
		mRadioTech = values[1];
		}

		mState = state;
		}
		@@ -122,7 +108,6 @@ public class OperatorInfo implements Parcelable {
		return "OperatorInfo " + mOperatorAlphaLong
		+ "/" + mOperatorAlphaShort
		+ "/" + mOperatorNumeric
		+ "/" + mRadioTech
		+ "/" + mState;
		}

		@@ -147,10 +132,7 @@ public class OperatorInfo implements Parcelable {
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(mOperatorAlphaLong);
		dest.writeString(mOperatorAlphaShort);
		if (mRadioTech.equals(""))
		dest.writeString(mOperatorNumeric);
		else
		dest.writeString(mOperatorNumeric + "+" + mRadioTech);
		dest.writeSerializable(mState);
		}