commit b4ea1e491f0f21e73f6939afd9ad14d5cac015b1
author Jeff Brown <jeffbrown@google.com> Mon Sep 12 14:59:51 2011 -0700
committer Jeff Brown <jeffbrown@google.com> Mon Sep 12 14:59:51 2011 -0700
tree dba9971c47bfe253208dfabbea24571fa185fa21
parent 31b562cede179bb39c2a4dc44788ddeb73567f2d

Fix crash in APN settings.
Bug: 4968921

Don't use managedQuery for one-shot queries.

Change-Id: I5d2e1bef0f399cb9dbe95d633c2ee014f6cd7f79

src/com/android/settings/ApnSettings.java

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 00ef3a7..57762d4 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -149,8 +149,8 @@
             + 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 @@
     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);