commit 1a04c21b5ae872a5be7f533caa80b6bb87e14b0c
author Eric Fischer <enf@google.com> Thu Mar 17 13:32:23 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 17 13:32:23 2011 -0700
tree d811419a2a38ec65f69489c45f836015ea8a24fa
parent dd68cde8fe7195ec99f973f550dfb2737e9c630d
parent 7f050e2ef8e1593d8a89f9d3357015c5eb1b8764

am 7f050e2e: Import revised translations.  DO NOT MERGE

* commit '7f050e2ef8e1593d8a89f9d3357015c5eb1b8764':
  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);