Merge branch 'master' of github.com:firebase/firebase-android-sdk into perfPackageMoveValidators

Author: visumickey

firebase-firestore/src/test/java/com/google/firebase/firestore/LoadBundleTaskTest.java

@@ -61,7 +61,20 @@ public class LoadBundleTaskTest {
 
   @Test
   public void testImplementsAllTaskInterface() {
+    // Check if the internal gms Hide annotation is accessible.
+    Class hideClazz = null;
+    try {
+      hideClazz = Class.forName("com.google.android.gms.common.internal.Hide");
+    } catch (ClassNotFoundException e) {
+      // Swallow the exception.
+    }
+
     for (Method method : Task.class.getDeclaredMethods()) {
+      // This method is annotated with @Hide, skipping.
+      if (hideClazz != null && method.getAnnotation(hideClazz) != null) {
+        continue;
+      }
+
       try {
         LoadBundleTask.class.getDeclaredMethod(method.getName(), method.getParameterTypes());
       } catch (NoSuchMethodException e) {

firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java

@@ -97,6 +97,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -106,7 +107,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
-import org.robolectric.android.util.concurrent.RoboExecutorService;
+import org.robolectric.android.util.concurrent.InlineExecutorService;
 
 /**
  * Subclasses of SpecTestCase run a set of portable event specifications from JSON spec files
@@ -222,7 +223,7 @@ public abstract class SpecTestCase implements RemoteStoreCallback {
   private int snapshotsInSyncEvents = 0;
 
   /** An executor to use for test callbacks. */
-  private final RoboExecutorService backgroundExecutor = new RoboExecutorService();
+  private final ExecutorService backgroundExecutor = new InlineExecutorService();
 
   /** The current user for the SyncEngine. Determines which mutation queue is active. */
   private User currentUser;

firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java

@@ -29,8 +29,8 @@
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.perf.config.ConfigResolver;
+import com.google.firebase.perf.config.RemoteConfigManager;
 import com.google.firebase.perf.internal.GaugeManager;
-import com.google.firebase.perf.internal.RemoteConfigManager;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.metrics.HttpMetric;
 import com.google.firebase.perf.metrics.Trace;

firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigResolver.java

@@ -39,7 +39,6 @@
 import com.google.firebase.perf.config.ConfigurationConstants.TraceEventCountBackground;
 import com.google.firebase.perf.config.ConfigurationConstants.TraceEventCountForeground;
 import com.google.firebase.perf.config.ConfigurationConstants.TraceSamplingRate;
-import com.google.firebase.perf.internal.RemoteConfigManager;
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.perf.util.Optional;

firebase-perf/src/main/java/com/google/firebase/perf/internal/RemoteConfigManager.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/config/RemoteConfigManager.java

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
-//
 // You may obtain a copy of the License at
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.internal;
+package com.google.firebase.perf.config;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;

firebase-perf/src/main/java/com/google/firebase/perf/injection/modules/FirebasePerformanceModule.java

@@ -21,8 +21,8 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.perf.FirebasePerformance;
 import com.google.firebase.perf.config.ConfigResolver;
+import com.google.firebase.perf.config.RemoteConfigManager;
 import com.google.firebase.perf.internal.GaugeManager;
-import com.google.firebase.perf.internal.RemoteConfigManager;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import dagger.Module;
 import dagger.Provides;

firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTest.java

@@ -34,8 +34,8 @@
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.config.DeviceCacheManager;
+import com.google.firebase.perf.config.RemoteConfigManager;
 import com.google.firebase.perf.internal.GaugeManager;
-import com.google.firebase.perf.internal.RemoteConfigManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;

firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigResolverTest.java

@@ -31,7 +31,6 @@
 import androidx.test.core.app.ApplicationProvider;
 import com.google.firebase.perf.BuildConfig;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.internal.RemoteConfigManager;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.perf.util.Optional;
 import org.junit.Before;

firebase-perf/src/test/java/com/google/firebase/perf/internal/RemoteConfigManagerTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/config/RemoteConfigManagerTest.java

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
-//
 // You may obtain a copy of the License at
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.internal;
+package com.google.firebase.perf.config;
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;