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

am 754af8ae: Merge "Fix crash in APN settings. Bug: 4968921"

Browse Source 
* commit '754af8aede867ed34eab58a4fb333c49303df8aa':
  Fix crash in APN settings. Bug: 4968921
This commit is contained in:
Jeff Brown
2011-09-12 16:28:37 -07:00
committed by Android Git Automerger
parent c35b2514de 754af8aede
commit b14e9d4612
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/ApnSettings.java
View File

@@ -149,8 +149,8 @@ public class ApnSettings extends PreferenceActivity implements
+ android.os.SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "")
+ "\"";
Cursor cursor = managedQuery(Telephony.Carriers.CONTENT_URI, new String[] {
"_id", "name", "apn", "type"}, where,
Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
"_id", "name", "apn", "type"}, where, null,
Telephony.Carriers.DEFAULT_SORT_ORDER);
PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
@@ -254,8 +254,8 @@ public class ApnSettings extends PreferenceActivity implements
private String getSelectedApnKey() {
String key = null;
Cursor cursor = managedQuery(PREFERAPN_URI, new String[] {"_id"},
null, Telephony.Carriers.DEFAULT_SORT_ORDER);
Cursor cursor = getContentResolver().query(PREFERAPN_URI, new String[] {"_id"},
null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
if (cursor.getCount() > 0) {
cursor.moveToFirst();
key = cursor.getString(ID_INDEX);