diff options
| author | Wink Saville <wink@google.com> | 2012-07-11 18:15:50 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2012-07-11 18:15:50 -0700 |
| commit | 5362f17ff5e8e06601b172bd86c26027ced9780c (patch) | |
| tree | 5d42b9b05f148cd90cd0613655a66ede573a3db5 /packages/SettingsProvider | |
| parent | f16336790bca9d3e946553f2e5a16e14bb9dbc3e (diff) | |
| parent | 1b003ef05fad1fbdad9674feda9cc1731c7d99dd (diff) | |
| download | frameworks_base-5362f17ff5e8e06601b172bd86c26027ced9780c.zip frameworks_base-5362f17ff5e8e06601b172bd86c26027ced9780c.tar.gz frameworks_base-5362f17ff5e8e06601b172bd86c26027ced9780c.tar.bz2 | |
Merge commit '1b003ef0' into mit
* commit '1b003ef0':
Create telephony-common and mms-common
Change-Id: Ie8876541dbe7f4c933cf7d69910dd204538bc975
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/Android.mk | 2 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/SettingsProvider/Android.mk b/packages/SettingsProvider/Android.mk index bf4ab1b..a2ea554 100644 --- a/packages/SettingsProvider/Android.mk +++ b/packages/SettingsProvider/Android.mk @@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_JAVA_LIBRARIES := +LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_PACKAGE_NAME := SettingsProvider LOCAL_CERTIFICATE := platform diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 2b2b818..71c8c83 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -33,12 +33,14 @@ import android.net.ConnectivityManager; import android.os.SystemProperties; import android.provider.Settings; import android.provider.Settings.Secure; +import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; import com.android.internal.content.PackageHelper; import com.android.internal.telephony.BaseCommands; import com.android.internal.telephony.Phone; +import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.RILConstants; import com.android.internal.util.XmlUtils; import com.android.internal.widget.LockPatternUtils; @@ -1590,7 +1592,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { // Set the preferred network mode to 0 = Global, CDMA default int type; - if (BaseCommands.getLteOnCdmaModeStatic() == Phone.LTE_ON_CDMA_TRUE) { + if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE) { type = Phone.NT_MODE_GLOBAL; } else { type = SystemProperties.getInt("ro.telephony.default_network", |