drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE

Browse Source 
* commit 'a558fdf156601a477964139fee57da29de7f31b3':
  Fix default preferred network.
This commit is contained in:
Wink Saville
2011-06-08 12:59:37 -07:00
committed by Android Git Automerger
parent 4e1504a66b a558fdf156
commit 0da86d4fef
4 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@ -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",
RILConstants.PREFERRED_NETWORK_MODE);
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

8
telephony/java/com/android/internal/telephony/PhoneFactory.java
View File

@ -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));

28
telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
View File

@ -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);
}
}

4
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@ -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);
}
}