From a89f672e48cb3154447c78d71b19b6708ee91ec5 Mon Sep 17 00:00:00 2001 From: Sam Mortimer Date: Fri, 15 Sep 2017 17:42:28 -0700 Subject: [PATCH] LineageSettings: Fixup ContentProvider query arguments As per similar changes made in frameworks/base/core/java/android/provider/Settings.java Whilst not strictly necessary, also renamed SELECT_VALUE to SELECT_VALUE_PROJECTION as it is now named in frameworks. Original AOSP change here: https://github.com/LineageOS/android_frameworks_base/commit/ea93fe75396465b26429cfe1c1dcfadf7351354f Change-Id: Ib79bdc9a9c1f45d5f8405c7ecea30f68652f2839 --- sdk/src/java/lineageos/providers/LineageSettings.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk/src/java/lineageos/providers/LineageSettings.java b/sdk/src/java/lineageos/providers/LineageSettings.java index 94b666b1..d9f17baf 100644 --- a/sdk/src/java/lineageos/providers/LineageSettings.java +++ b/sdk/src/java/lineageos/providers/LineageSettings.java @@ -132,7 +132,7 @@ public final class LineageSettings { private final String mVersionSystemProperty; private final Uri mUri; - private static final String[] SELECT_VALUE = + private static final String[] SELECT_VALUE_PROJECTION = new String[] { Settings.NameValueTable.VALUE }; private static final String NAME_EQ_PLACEHOLDER = "name=?"; @@ -264,8 +264,9 @@ public final class LineageSettings { Cursor c = null; try { - c = cp.query(cr.getPackageName(), mUri, SELECT_VALUE, NAME_EQ_PLACEHOLDER, - new String[]{name}, null, null); + Bundle queryArgs = ContentResolver.createSqlQueryBundle( + NAME_EQ_PLACEHOLDER, new String[]{name}, null); + c = cp.query(cr.getPackageName(), mUri, SELECT_VALUE_PROJECTION, queryArgs, null); if (c == null) { Log.w(TAG, "Can't get key " + name + " from " + mUri); return null;