diff options
| author | Wink Saville <> | 2009-04-02 11:00:56 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-02 11:00:56 -0700 |
| commit | c38866843e966622346dc8f7b028749cac9c2198 (patch) | |
| tree | 111fcc6911cc13c20c271ce793b7124a55fba0dd /src/com/android/settings/ApnSettings.java | |
| parent | 0e2016789ee27db86300329305f2f638b25037f0 (diff) | |
| download | packages_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/ApnSettings.java')
| -rw-r--r-- | src/com/android/settings/ApnSettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index ecfdb24..2624990 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -146,7 +146,7 @@ public class ApnSettings extends PreferenceActivity implements private void fillList() { String where = "numeric=\"" - + android.os.SystemProperties.get(TelephonyProperties.PROPERTY_SIM_OPERATOR_NUMERIC, "") + + android.os.SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "") + "\""; Cursor cursor = managedQuery(Telephony.Carriers.CONTENT_URI, new String[] { |