commit b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710
author Glenn Kasten <gkasten@google.com> Mon Apr 11 12:43:22 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 11 12:43:22 2011 -0700
tree 657cfa82f2dd75c01a891f6826250bb0a873890c
parent 84edd9d5281cb8e03ea31631aa232b8458136f32
parent 858fd9a0302c6d34781133137a048a9bf668632a

am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit '858fd9a0302c6d34781133137a048a9bf668632a':
  HDCP debugging in setting app part 2 of 2

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