am cd4636ec: Add LteOnCdmaDevice system property. (6e8c7dd2) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/BaseCommands.java

+18 −13

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.os.Registrant;
		import android.os.Handler;
		import android.os.AsyncResult;
		import android.os.SystemProperties;
		import android.util.Config;
		import android.util.Log;

		import java.io.FileInputStream;
		@@ -691,7 +690,7 @@ public abstract class BaseCommands implements CommandsInterface {
		RadioState oldState;

		synchronized (mStateMonitor) {
		if (Config.LOGV) {
		if (false) {
		Log.v(LOG_TAG, "setRadioState old: " + mState
		+ " new " + newState);
		}
		@@ -858,8 +857,13 @@ public abstract class BaseCommands implements CommandsInterface {
		*/
		public static int getLteOnCdmaModeStatic() {
		int retVal;
		String productType;
		int curVal;
		String productType = "";

		curVal = SystemProperties.getInt(TelephonyProperties.PROPERTY_LTE_ON_CDMA_DEVICE,
		Phone.LTE_ON_CDMA_UNKNOWN);
		retVal = curVal;
		if (retVal == Phone.LTE_ON_CDMA_UNKNOWN) {
		Matcher matcher = sProductTypePattern.matcher(sKernelCmdLine);
		if (matcher.find()) {
		productType = matcher.group(1);
		@@ -870,10 +874,11 @@ public abstract class BaseCommands implements CommandsInterface {
		}
		} else {
		retVal = Phone.LTE_ON_CDMA_FALSE;
		productType = "";
		}
		}

		Log.d(LOG_TAG, "getLteOnCdmaMode=" + retVal + " product_type='" + productType +
		Log.d(LOG_TAG, "getLteOnCdmaMode=" + retVal + " curVal=" + curVal +
		" product_type='" + productType +
		"' lteOnCdmaProductType='" + sLteOnCdmaProductType + "'");
		return retVal;
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,15 @@ public interface TelephonyProperties
		*/
		static final String PROPERTY_LTE_ON_CDMA_PRODUCT_TYPE = "telephony.lteOnCdmaProductType";

		/**
		* The contents of this property is the one of {@link Phone#LTE_ON_CDMA_TRUE} or
		* {@link Phone#LTE_ON_CDMA_FALSE}. If absent the value will assumed to be false
		* and the {@see #PROPERTY_LTE_ON_CDMA_PRODUCT_TYPE} will be used to determine its
		* final value which could also be {@link Phone#LTE_ON_CDMA_FALSE}.
		* {@see BaseCommands#getLteOnCdmaMode()}
		*/
		static final String PROPERTY_LTE_ON_CDMA_DEVICE = "telephony.lteOnCdmaDevice";

		static final String CURRENT_ACTIVE_PHONE = "gsm.current.phone-type";

		//****** SIM Card