Merge "Fix default preferred network." into honeycomb-LTE (a558fdf1) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package com.android.providers.settings;

		import com.android.internal.content.PackageHelper;
		import com.android.internal.telephony.BaseCommands;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.RILConstants;
		import com.android.internal.util.XmlUtils;
		import com.android.internal.widget.LockPatternUtils;
		@@ -1300,8 +1302,13 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		}

		// Set the preferred network mode to 0 = Global, CDMA default
		int type = SystemProperties.getInt("ro.telephony.default_network",
		int type;
		if (BaseCommands.getLteOnCdmaModeStatic() == Phone.LTE_ON_CDMA_TRUE) {
		type = Phone.NT_MODE_GLOBAL;
		} else {
		type = SystemProperties.getInt("ro.telephony.default_network",
		RILConstants.PREFERRED_NETWORK_MODE);
		}
		loadSetting(stmt, Settings.Secure.PREFERRED_NETWORK_MODE, type);

		// Enable or disable Cell Broadcast SMS

telephony/java/com/android/internal/telephony/PhoneFactory.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -47,8 +47,6 @@ public class PhoneFactory {
		static private Looper sLooper;
		static private Context sContext;

		static final int preferredNetworkMode = RILConstants.PREFERRED_NETWORK_MODE;

		static final int preferredCdmaSubscription = RILConstants.PREFERRED_CDMA_SUBSCRIPTION;

		//***** Class Methods
		@@ -99,7 +97,11 @@ public class PhoneFactory {

		sPhoneNotifier = new DefaultPhoneNotifier();

		//Get preferredNetworkMode from Settings.System
		// Get preferred network mode
		int preferredNetworkMode = RILConstants.PREFERRED_NETWORK_MODE;
		if (BaseCommands.getLteOnCdmaModeStatic() == Phone.LTE_ON_CDMA_TRUE) {
		preferredNetworkMode = Phone.NT_MODE_GLOBAL;
		}
		int networkMode = Settings.Secure.getInt(context.getContentResolver(),
		Settings.Secure.PREFERRED_NETWORK_MODE, preferredNetworkMode);
		Log.i(LOG_TAG, "Network Mode set to " + Integer.toString(networkMode));

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

+14 −14

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.internal.telephony.cdma;

		import com.android.internal.telephony.DataConnectionTracker;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.telephony.MccTable;
		import com.android.internal.telephony.EventLogTags;
		@@ -26,23 +25,15 @@ import android.telephony.SignalStrength;
		import android.telephony.ServiceState;
		import android.telephony.cdma.CdmaCellLocation;
		import android.os.AsyncResult;
		import android.os.Handler;
		import android.os.Message;
		import android.os.Registrant;
		import android.os.RegistrantList;
		import android.os.AsyncResult;
		import android.os.Message;
		import android.os.SystemProperties;


		import android.util.Log;
		import android.util.EventLog;

		import com.android.internal.telephony.RestrictedState;
		import com.android.internal.telephony.gsm.GsmDataConnectionTracker;

		public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		static final String LOG_TAG = "CDMA";

		CDMALTEPhone mCdmaLtePhone;

		private ServiceState mLteSS; // The last LTE state from Voice Registration
		@@ -56,6 +47,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		if (DBG) log("CdmaLteServiceStateTracker Constructors");
		}

		@Override
		public void dispose() {
		cm.unregisterForSIMReady(this);
		super.dispose();
		@@ -398,6 +390,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		}
		}

		@Override
		protected void onSignalStrengthResult(AsyncResult ar) {
		SignalStrength oldSignalStrength = mSignalStrength;

		@@ -439,6 +432,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		}
		}

		@Override
		public boolean isConcurrentVoiceAndDataAllowed() {
		// Note: it needs to be confirmed which CDMA network types
		// can support voice and data calls concurrently.
		@@ -447,6 +441,16 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		return false;
		}

		/**
		* Returns OTASP_NOT_NEEDED as its not needed for LTE
		*/
		@Override
		int getOtasp() {
		int provisioningState = OTASP_NOT_NEEDED;
		if (DBG) log("getOtasp: state=" + provisioningState);
		return provisioningState;
		}

		@Override
		protected void log(String s) {
		Log.d(LOG_TAG, "[CdmaLteSST] " + s);
		@@ -456,8 +460,4 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		protected void loge(String s) {
		Log.e(LOG_TAG, "[CdmaLteSST] " + s);
		}

		protected static void sloge(String s) {
		Log.e(LOG_TAG, "[CdmaLteSST] " + s);
		}
		}

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -1631,8 +1631,4 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
		protected void loge(String s) {
		Log.e(LOG_TAG, "[CdmaSST] " + s);
		}

		private static void slog(String s) {
		Log.d(LOG_TAG, "[CdmaSST] " + s);
		}
		}