Merge branch 'master' of https://github.com/firebase/firebase-android-sdk into rpf-perf-ktx-trace

Author: thatfiredev

appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactory.java

@@ -23,7 +23,10 @@
 /**
  * Implementation of an {@link AppCheckProviderFactory} that builds {@link
  * SafetyNetAppCheckProvider}s. This is the default implementation.
+ *
+ * @deprecated Use {@code PlayIntegrityAppCheckProviderFactory} instead.
  */
+@Deprecated
 public class SafetyNetAppCheckProviderFactory implements AppCheckProviderFactory {
 
   private static final SafetyNetAppCheckProviderFactory instance =
@@ -34,7 +37,10 @@ private SafetyNetAppCheckProviderFactory() {}
   /**
    * Gets an instance of this class for installation into a {@link
    * com.google.firebase.appcheck.FirebaseAppCheck} instance.
+   *
+   * @deprecated Use {@code PlayIntegrityAppCheckProviderFactory#getInstance} instead.
    */
+  @Deprecated
   @NonNull
   public static SafetyNetAppCheckProviderFactory getInstance() {
     return instance;

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClient.java

@@ -413,7 +413,7 @@ private static ConfigContainer extractConfigs(JSONObject fetchResponse, Date fet
         // Do nothing if entries do not exist.
       }
       if (entries != null) {
-        containerBuilder.replaceConfigsWith(entries);
+        containerBuilder = containerBuilder.replaceConfigsWith(entries);
       }
 
       JSONArray experimentDescriptions = null;
@@ -423,7 +423,7 @@ private static ConfigContainer extractConfigs(JSONObject fetchResponse, Date fet
         // Do nothing if entries do not exist.
       }
       if (experimentDescriptions != null) {
-        containerBuilder.withAbtExperiments(experimentDescriptions);
+        containerBuilder = containerBuilder.withAbtExperiments(experimentDescriptions);
       }
 
       JSONObject personalizationMetadata = null;
@@ -433,7 +433,7 @@ private static ConfigContainer extractConfigs(JSONObject fetchResponse, Date fet
         // Do nothing if personalizationMetadata does not exist.
       }
       if (personalizationMetadata != null) {
-        containerBuilder.withPersonalizationMetadata(personalizationMetadata);
+        containerBuilder = containerBuilder.withPersonalizationMetadata(personalizationMetadata);
       }
 
       return containerBuilder.build();

firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandlerTest.java

@@ -1033,10 +1033,10 @@ private static ConfigContainer extractConfigs(JSONObject fetchResponse, Date fet
         ConfigContainer.newBuilder().withFetchTime(fetchTime);
 
     JSONObject entries = fetchResponse.getJSONObject(ENTRIES);
-    containerBuilder.replaceConfigsWith(entries);
+    containerBuilder = containerBuilder.replaceConfigsWith(entries);
 
     JSONArray experimentDescriptions = fetchResponse.getJSONArray(EXPERIMENT_DESCRIPTIONS);
-    containerBuilder.withAbtExperiments(experimentDescriptions);
+    containerBuilder = containerBuilder.withAbtExperiments(experimentDescriptions);
 
     return containerBuilder.build();
   }

firebase-perf/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Unreleased
 
-* [fixed] Fixed a bug where screen traces were not capturing frame metrics for multi-activity apps.
-* [feature] Added support for measuring screen performance metrics for "Activity Fragments" out-of-the-box.
-* [fixed] Excluded custom attributes whose key/value length is 0.
-
-
 # 20.2.0
 * [unchanged] Updated to accommodate the release of the updated
   [perfmon] Kotlin extensions library.