From 02b4a387aa85f3a084b22716c1221bc2b2ad9133 Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Wed, 11 Mar 2020 15:15:42 -0700
Subject: [PATCH] Allow empty tokens in strict grammar

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

Fixes: 151151800
Test: atest SQLiteQueryBuilderTest#testStrictQueryEmptyToken
Change-Id: Iac1cdd643253fd186a164b863d65d6e92698fd38
(cherry picked from commit e409ec2492f47be9a0f3917bbbb324624eec7b5e)
Merged-In: Iac1cdd643253fd186a164b863d65d6e92698fd38
---
 core/java/android/database/sqlite/SQLiteQueryBuilder.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/database/sqlite/SQLiteQueryBuilder.java b/core/java/android/database/sqlite/SQLiteQueryBuilder.java
index 669d0466fdf2a..e9c59f55a418d 100644
--- a/core/java/android/database/sqlite/SQLiteQueryBuilder.java
+++ b/core/java/android/database/sqlite/SQLiteQueryBuilder.java
@@ -798,6 +798,7 @@ public class SQLiteQueryBuilder {
     }
 
     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;