summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2019-12-18 00:48:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-12-18 00:48:19 +0000
commit56911a8623b3c178b0409737a969e81a7cadf031 (patch)
tree8ca3f72fb3b187e1b5558b0d7e2f1a6ab55cd88b
parentb50bc1f669412a3afd2ab998f744aa1423048fe5 (diff)
parent71c694aa382f36fb6b6af0c7c537130e7c8adeff (diff)
Merge "Allow "LOCALIZED" and "UNICODE" collators."
-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);