commit e9fdee0ed0ca2f2e0e83cda161906ca3a0a673a6
author Jake Hamby <jhamby@google.com> Tue Mar 29 13:31:54 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 29 13:31:54 2011 -0700
tree 56126d5babee6dcd518b47c80f630ee255c65a88
parent 388fc081bcca23525fa5a7cea58b8d4ae794d69c
parent 81cb6be834f4604f6b58d8516f2b8e12620a3d16

am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit '81cb6be834f4604f6b58d8516f2b8e12620a3d16':
  Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

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