PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp

Browse Source 
Change-Id: I8edb2e7f07f793e78c15bcf9b2f048d91b1f6504
This commit is contained in:
Lorenzo Colitti
2011-03-04 14:49:40 -08:00
parent e0db177334 a4fb8c8684
commit 67c70267d1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ApnEditor.java
View File

@@ -38,6 +38,7 @@ import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import com.android.internal.telephony.TelephonyProperties; import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.telephony.RILConstants;
public class ApnEditor extends PreferenceActivity public class ApnEditor extends PreferenceActivity
@@ -431,6 +432,11 @@ public class ApnEditor extends PreferenceActivity
values.put(Telephony.Carriers.PROTOCOL, checkNotSet(mProtocol.getValue())); 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.TYPE, checkNotSet(mApnType.getText()));
values.put(Telephony.Carriers.MCC, mcc); values.put(Telephony.Carriers.MCC, mcc);