Merge "Adding new hidden carrier API to mark GSM/CDMA networks as... (851cbcf8) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -1888,6 +1888,13 @@ public interface Phone {
		*/
		public boolean setOperatorBrandOverride(String brand);

		/**
		* Override the roaming indicator for the current ICCID.
		*/
		public boolean setRoamingOverride(List<String> gsmRoamingList,
		List<String> gsmNonRoamingList, List<String> cdmaRoamingList,
		List<String> cdmaNonRoamingList);

		/**
		* Is Radio Present on the device and is it accessible
		*/

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

+72 −1

Original line number	Diff line number	Diff line
		@@ -65,8 +65,10 @@ import com.android.internal.telephony.uicc.UsimServiceTable;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Locale;
		import java.util.Set;
		import java.util.concurrent.atomic.AtomicReference;

		/**
		@@ -163,7 +165,11 @@ public abstract class PhoneBase extends Handler implements Phone {
		protected static final int EVENT_SS = 36;
		protected static final int EVENT_LAST = EVENT_SS;


		// For shared prefs.
		private static final String GSM_ROAMING_LIST_OVERRIDE_PREFIX = "gsm_roaming_list_";
		private static final String GSM_NON_ROAMING_LIST_OVERRIDE_PREFIX = "gsm_non_roaming_list_";
		private static final String CDMA_ROAMING_LIST_OVERRIDE_PREFIX = "cdma_roaming_list_";
		private static final String CDMA_NON_ROAMING_LIST_OVERRIDE_PREFIX = "cdma_non_roaming_list_";

		// Key used to read/write current CLIR setting
		public static final String CLIR_KEY = "clir_key";
		@@ -1989,6 +1995,71 @@ public abstract class PhoneBase extends Handler implements Phone {
		return false;
		}

		@Override
		public boolean setRoamingOverride(List<String> gsmRoamingList,
		List<String> gsmNonRoamingList, List<String> cdmaRoamingList,
		List<String> cdmaNonRoamingList) {
		String iccId = getIccSerialNumber();
		if (TextUtils.isEmpty(iccId)) {
		return false;
		}

		setRoamingOverrideHelper(gsmRoamingList, GSM_ROAMING_LIST_OVERRIDE_PREFIX, iccId);
		setRoamingOverrideHelper(gsmNonRoamingList, GSM_NON_ROAMING_LIST_OVERRIDE_PREFIX, iccId);
		setRoamingOverrideHelper(cdmaRoamingList, CDMA_ROAMING_LIST_OVERRIDE_PREFIX, iccId);
		setRoamingOverrideHelper(cdmaNonRoamingList, CDMA_NON_ROAMING_LIST_OVERRIDE_PREFIX, iccId);

		// Refresh.
		ServiceStateTracker tracker = getServiceStateTracker();
		if (tracker != null) {
		tracker.pollState();
		}
		return true;
		}

		private void setRoamingOverrideHelper(List<String> list, String prefix, String iccId) {
		SharedPreferences.Editor spEditor =
		PreferenceManager.getDefaultSharedPreferences(mContext).edit();
		String key = prefix + iccId;
		if (list == null \|\| list.isEmpty()) {
		spEditor.remove(key).commit();
		} else {
		spEditor.putStringSet(key, new HashSet<String>(list)).commit();
		}
		}

		public boolean isMccMncMarkedAsRoaming(String mccMnc) {
		return getRoamingOverrideHelper(GSM_ROAMING_LIST_OVERRIDE_PREFIX, mccMnc);
		}

		public boolean isMccMncMarkedAsNonRoaming(String mccMnc) {
		return getRoamingOverrideHelper(GSM_NON_ROAMING_LIST_OVERRIDE_PREFIX, mccMnc);
		}

		public boolean isSidMarkedAsRoaming(int SID) {
		return getRoamingOverrideHelper(CDMA_ROAMING_LIST_OVERRIDE_PREFIX,
		Integer.toString(SID));
		}

		public boolean isSidMarkedAsNonRoaming(int SID) {
		return getRoamingOverrideHelper(CDMA_NON_ROAMING_LIST_OVERRIDE_PREFIX,
		Integer.toString(SID));
		}

		private boolean getRoamingOverrideHelper(String prefix, String key) {
		String iccId = getIccSerialNumber();
		if (TextUtils.isEmpty(iccId) \|\| TextUtils.isEmpty(key)) {
		return false;
		}

		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
		Set<String> value = sp.getStringSet(prefix + iccId, null);
		if (value == null) {
		return false;
		}
		return value.contains(key);
		}

		@Override
		public boolean isRadioAvailable() {
		return mCi.getRadioState().isAvailable();

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import com.android.internal.telephony.uicc.UsimServiceTable;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.List;
		import java.util.Set;

		import com.android.internal.telephony.dataconnection.DctController;

		@@ -1445,6 +1446,14 @@ public class PhoneProxy extends Handler implements Phone {
		return mActivePhone.setOperatorBrandOverride(brand);
		}

		@Override
		public boolean setRoamingOverride(List<String> gsmRoamingList,
		List<String> gsmNonRoamingList, List<String> cdmaRoamingList,
		List<String> cdmaNonRoamingList) {
		return mActivePhone.setRoamingOverride(gsmRoamingList, gsmNonRoamingList,
		cdmaRoamingList, cdmaNonRoamingList);
		}

		@Override
		public boolean isRadioAvailable() {
		return mCommandsInterface.getRadioState().isAvailable();

src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.telephony.cdma.CdmaCellLocation;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.os.AsyncResult;
		import android.os.Build;
		import android.os.Message;
		import android.os.UserHandle;
		import android.os.SystemClock;
		@@ -303,6 +304,26 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		protected void pollStateDone() {
		log("pollStateDone: lte 1 ss=[" + mSS + "] newSS=[" + mNewSS + "]");

		if (mPhone.isMccMncMarkedAsNonRoaming(mNewSS.getOperatorNumeric()) \|\|
		mPhone.isSidMarkedAsNonRoaming(mNewSS.getSystemId())) {
		log("pollStateDone: override - marked as non-roaming.");
		mNewSS.setVoiceRoaming(false);
		mNewSS.setDataRoaming(false);
		mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_OFF);
		} else if (mPhone.isMccMncMarkedAsRoaming(mNewSS.getOperatorNumeric()) \|\|
		mPhone.isSidMarkedAsRoaming(mNewSS.getSystemId())) {
		log("pollStateDone: override - marked as roaming.");
		mNewSS.setVoiceRoaming(true);
		mNewSS.setDataRoaming(true);
		mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_ON);
		mNewSS.setCdmaEriIconMode(EriInfo.ROAMING_ICON_MODE_NORMAL);
		}

		if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean(PROP_FORCE_ROAMING, false)) {
		mNewSS.setVoiceRoaming(true);
		mNewSS.setDataRoaming(true);
		}

		useDataRegStateForDataOnlyDevices();

		boolean hasRegistered = mSS.getVoiceRegState() != ServiceState.STATE_IN_SERVICE

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -1104,6 +1104,21 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
		protected void pollStateDone() {
		if (DBG) log("pollStateDone: cdma oldSS=[" + mSS + "] newSS=[" + mNewSS + "]");

		if (mPhone.isMccMncMarkedAsNonRoaming(mNewSS.getOperatorNumeric()) \|\|
		mPhone.isSidMarkedAsNonRoaming(mNewSS.getSystemId())) {
		log("pollStateDone: override - marked as non-roaming.");
		mNewSS.setVoiceRoaming(false);
		mNewSS.setDataRoaming(false);
		mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_OFF);
		} else if (mPhone.isMccMncMarkedAsRoaming(mNewSS.getOperatorNumeric()) \|\|
		mPhone.isSidMarkedAsRoaming(mNewSS.getSystemId())) {
		log("pollStateDone: override - marked as roaming.");
		mNewSS.setVoiceRoaming(true);
		mNewSS.setDataRoaming(true);
		mNewSS.setCdmaEriIconIndex(EriInfo.ROAMING_INDICATOR_ON);
		mNewSS.setCdmaEriIconMode(EriInfo.ROAMING_ICON_MODE_NORMAL);
		}

		if (Build.IS_DEBUGGABLE && SystemProperties.getBoolean(PROP_FORCE_ROAMING, false)) {
		mNewSS.setVoiceRoaming(true);
		mNewSS.setDataRoaming(true);