summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-09-12 14:59:51 -0700
committerJeff Brown <jeffbrown@google.com>2011-09-12 14:59:51 -0700
commitb4ea1e491f0f21e73f6939afd9ad14d5cac015b1 (patch)
treedba9971c47bfe253208dfabbea24571fa185fa21
parent31b562cede179bb39c2a4dc44788ddeb73567f2d (diff)
downloadpackages_apps_Settings-b4ea1e491f0f21e73f6939afd9ad14d5cac015b1.tar.gz
packages_apps_Settings-b4ea1e491f0f21e73f6939afd9ad14d5cac015b1.tar.bz2
packages_apps_Settings-b4ea1e491f0f21e73f6939afd9ad14d5cac015b1.zip
Fix crash in APN settings.
Bug: 4968921 Don't use managedQuery for one-shot queries. Change-Id: I5d2e1bef0f399cb9dbe95d633c2ee014f6cd7f79
-rw-r--r--src/com/android/settings/ApnSettings.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 00ef3a796..57762d40c 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);