Skip to content

Commit 7fabd7f

Browse files
Fix merge
1 parent 0b2d9ad commit 7fabd7f

File tree

3 files changed

+1
-228
lines changed

3 files changed

+1
-228
lines changed

firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLitePersistence.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ public void onOpen(SQLiteDatabase db) {
336336

337337
/**
338338
* A simple queue that executes tasks in parallel on the Android's AsyncTask.THREAD_POOL_EXECUTOR
339-
* and allows to block on their completion.
339+
* and supports blocking on their completion.
340340
*
341341
* <p>This class is not thread-safe. In particular, `execute()` and `drain()` should not be called
342342
* from parallel threads.

firebase-firestore/src/main/java/com/google/firebase/firestore/util/TaskQueue.java

Lines changed: 0 additions & 120 deletions
This file was deleted.

firebase-firestore/src/test/java/com/google/firebase/firestore/util/TaskQueueTest.java

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)