diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2011-03-04 14:49:40 -0800 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2011-03-04 14:49:40 -0800 |
| commit | 67c70267d16996ced73ac2e7648b0a79baed3c16 (patch) | |
| tree | a7f0ee04771c982adf1cafbf9c378c8529966dc5 /src/com/android/settings/ApnEditor.java | |
| parent | e0db17733499a8922fcd742343d7d6210be04d55 (diff) | |
| parent | a4fb8c868459ac0cf763916555c4e9963965242c (diff) | |
| download | packages_apps_Settings-67c70267d16996ced73ac2e7648b0a79baed3c16.zip packages_apps_Settings-67c70267d16996ced73ac2e7648b0a79baed3c16.tar.gz packages_apps_Settings-67c70267d16996ced73ac2e7648b0a79baed3c16.tar.bz2 | |
resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp
Change-Id: I8edb2e7f07f793e78c15bcf9b2f048d91b1f6504
Diffstat (limited to 'src/com/android/settings/ApnEditor.java')
| -rw-r--r-- | src/com/android/settings/ApnEditor.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index f738823..13b7aa5 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -38,6 +38,7 @@ import android.view.Menu; import android.view.MenuItem; import com.android.internal.telephony.TelephonyProperties; +import com.android.internal.telephony.RILConstants; public class ApnEditor extends PreferenceActivity @@ -431,6 +432,11 @@ public class ApnEditor extends PreferenceActivity values.put(Telephony.Carriers.PROTOCOL, checkNotSet(mProtocol.getValue())); + // Hardcode IPv4 roaming for now until the carriers sort out all the + // billing arrangements. + values.put(Telephony.Carriers.ROAMING_PROTOCOL, + RILConstants.SETUP_DATA_PROTOCOL_IP); + values.put(Telephony.Carriers.TYPE, checkNotSet(mApnType.getText())); values.put(Telephony.Carriers.MCC, mcc); |