commit 6ef16e3840bf5d3c90ab335bcb24daaba212f075
author Hall Liu <hallliu@google.com> Wed Mar 11 15:15:42 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Oct 27 20:56:44 2020 +0000
tree 1c71eb3477378bee33a005c337540ccda0baa510
parent 4290693f5d7a996311f435cca2babee4212ec22f

Allow empty tokens in strict grammar

In SQLiteQueryBuilder, allow empty tokens when checking for invalid
tokens during the strict grammar check.

Fixes: 151151800
Fixes: 161769478
Test: atest SQLiteQueryBuilderTest#testStrictQueryEmptyToken
Change-Id: Iac1cdd643253fd186a164b863d65d6e92698fd38
(cherry picked from commit e409ec2492f47be9a0f3917bbbb324624eec7b5e)
(cherry picked from commit b7cffcab3228c7de9d6450f746cd5066dcfbb621)

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 669d046..e9c59f5 100644
--- a/core/java/android/database/sqlite/SQLiteQueryBuilder.java
+++ b/core/java/android/database/sqlite/SQLiteQueryBuilder.java
@@ -798,6 +798,7 @@
     }
 
     private void enforceStrictToken(@NonNull String token) {
+        if (TextUtils.isEmpty(token)) return;
         if (isTableOrColumn(token)) return;
         if (SQLiteTokenizer.isFunction(token)) return;
         if (SQLiteTokenizer.isType(token)) return;