summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ApnEditor.java
diff options
context:
space:
mode:
authorWink Saville <>2009-04-02 11:00:56 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-02 11:00:56 -0700
commitc38866843e966622346dc8f7b028749cac9c2198 (patch)
tree111fcc6911cc13c20c271ce793b7124a55fba0dd /src/com/android/settings/ApnEditor.java
parent0e2016789ee27db86300329305f2f638b25037f0 (diff)
downloadpackages_apps_Settings-c38866843e966622346dc8f7b028749cac9c2198.zip
packages_apps_Settings-c38866843e966622346dc8f7b028749cac9c2198.tar.gz
packages_apps_Settings-c38866843e966622346dc8f7b028749cac9c2198.tar.bz2
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
Diffstat (limited to 'src/com/android/settings/ApnEditor.java')
-rw-r--r--src/com/android/settings/ApnEditor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index f1fa2ef..0bd91a8 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -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