commit 56911a8623b3c178b0409737a969e81a7cadf031
author Jeff Sharkey <jsharkey@google.com> Wed Dec 18 00:48:19 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 18 00:48:19 2019 +0000
tree 8ca3f72fb3b187e1b5558b0d7e2f1a6ab55cd88b
parent b50bc1f669412a3afd2ab998f744aa1423048fe5
parent 71c694aa382f36fb6b6af0c7c537130e7c8adeff

Merge "Allow "LOCALIZED" and "UNICODE" collators."

core/java/android/database/sqlite/SQLiteQueryBuilder.java

diff --git a/core/java/android/database/sqlite/SQLiteQueryBuilder.java b/core/java/android/database/sqlite/SQLiteQueryBuilder.java
index 48d8867..39c1dac 100644
--- a/core/java/android/database/sqlite/SQLiteQueryBuilder.java
+++ b/core/java/android/database/sqlite/SQLiteQueryBuilder.java
@@ -823,6 +823,7 @@
         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);