From b4ea1e491f0f21e73f6939afd9ad14d5cac015b1 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 12 Sep 2011 14:59:51 -0700 Subject: [PATCH] Fix crash in APN settings. Bug: 4968921 Don't use managedQuery for one-shot queries. Change-Id: I5d2e1bef0f399cb9dbe95d633c2ee014f6cd7f79 --- src/com/android/settings/ApnSettings.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index 00ef3a79695..57762d40cb9 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -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);