summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2019-12-17 16:15:50 -0700
committer Jeff Sharkey <jsharkey@android.com> 2019-12-17 16:15:52 -0700
commit71c694aa382f36fb6b6af0c7c537130e7c8adeff (patch)
tree324d47b2aa85f7ef44d552f6c7aab8fb11182ffa
parentcd880e9596ed5ab3c3066a94c9f8dba6d0393d23 (diff)
Allow "LOCALIZED" and "UNICODE" collators.
These custom collators are added by ./android/sqlite3_android.cpp, so let callers use them. Bug: 140666363 Test: atest android.database.sqlite.cts.SQLiteQueryBuilderTest Change-Id: I6674b04afb5bbb5f9870329431549eca8e4f5bc6
-rw-r--r--core/java/android/database/sqlite/SQLiteQueryBuilder.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/database/sqlite/SQLiteQueryBuilder.java b/core/java/android/database/sqlite/SQLiteQueryBuilder.java
index 48d88678f721..39c1daca1bfd 100644
--- a/core/java/android/database/sqlite/SQLiteQueryBuilder.java
+++ b/core/java/android/database/sqlite/SQLiteQueryBuilder.java
@@ -823,6 +823,7 @@ public class SQLiteQueryBuilder {
switch (token.toUpperCase(Locale.US)) {
case "COLLATE": case "ASC": case "DESC":
case "BINARY": case "RTRIM": case "NOCASE":
+ case "LOCALIZED": case "UNICODE":
return;
}
throw new IllegalArgumentException("Invalid token " + token);