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

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Browse Source 
Automated import of CL 144245
This commit is contained in:
Wink Saville
2009-04-02 11:00:56 -07:00
committed by The Android Open Source Project
parent 0e2016789e
commit c38866843e
8 changed files with 109 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,7 @@ public class ApnEditor extends PreferenceActivity
mApnType.setText(mCursor.getString(TYPE_INDEX));
if (mNewApn) {
String numeric =
SystemProperties.get(TelephonyProperties.PROPERTY_SIM_OPERATOR_NUMERIC);
SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);
// MCC is first 3 chars and then in 2 - 3 chars of MNC
if (numeric != null && numeric.length() > 4) {
// Country code