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/ApnSettings.java
View File

@@ -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[] {