diff options
author | Sam Mortimer <sam@mortimer.me.uk> | 2017-09-15 17:42:28 -0700 |
---|---|---|
committer | Sam Mortimer <sam@mortimer.me.uk> | 2017-10-09 16:48:20 +0000 |
commit | a89f672e48cb3154447c78d71b19b6708ee91ec5 (patch) | |
tree | 38e45523ae505d863d3fe390b7a4c1c7390093de /sdk | |
parent | 80afa3feef9adb92f59497bf3e6bc3035cb74fc8 (diff) | |
download | lineage-sdk-a89f672e48cb3154447c78d71b19b6708ee91ec5.tar.gz lineage-sdk-a89f672e48cb3154447c78d71b19b6708ee91ec5.tar.bz2 lineage-sdk-a89f672e48cb3154447c78d71b19b6708ee91ec5.zip |
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
Diffstat (limited to 'sdk')
-rw-r--r-- | sdk/src/java/lineageos/providers/LineageSettings.java | 7 |
1 files 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; |