commit dd68cde8fe7195ec99f973f550dfb2737e9c630d
author Eric Fischer <enf@google.com> Wed Mar 16 17:08:19 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 16 17:08:19 2011 -0700
tree 5d533b7109b7c155d60ab3028acde647afdc3f09
parent d1a2e38ae2c8d64b7fadc979ac7a58c138809745
parent 24d6195266848c20cb0e2b0a737b9c2871f68346

am 24d61952: Import revised translations.  DO NOT MERGE

* commit '24d6195266848c20cb0e2b0a737b9c2871f68346':
  Import revised translations.  DO NOT MERGE

src/com/android/settings/ApnEditor.java

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.MenuItem;
 
 import com.android.internal.telephony.TelephonyProperties;
+import com.android.internal.telephony.RILConstants;
 
 
 public class ApnEditor extends PreferenceActivity
@@ -431,6 +432,11 @@
 
         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);