add missing imports to pass compileDebugAndroidTestJavaWithJavac

Author: milaGGL

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java

@@ -31,6 +31,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
@@ -1071,8 +1072,6 @@ public void resumingQueryShouldRemoveDeletedDocumentsIndicatedByExistenceFilter(
     assertEquals(snapshot2.size(), 50);
   }
 
-  // TODO(orquery): Enable this test when prod supports OR queries.
-  @Ignore
   @Test
   public void testOrQueries() {
     Map<String, Map<String, Object>> testDocs =

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/RemoteEvent.java

@@ -56,8 +56,8 @@ public Map<Integer, TargetChange> getTargetChanges() {
   }
 
   /**
-   * A map of targets that is known to be inconsistent, and the purpose for re-listening. Listens
-   * for these targets should be re-established without resume tokens.
+   * Returns a map of targets that is known to be inconsistent, and the purpose for re-listening.
+   * Listens for these targets should be re-established without resume tokens.
    */
   public Map<Integer, QueryPurpose> getTargetMismatches() {
     return targetMismatches;