Additional changes

Author: tejasd

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

@@ -116,7 +116,7 @@ public void setMetadataBundle(ImmutableBundle bundle) {
   /** Default API to call for whether performance monitoring is currently silent. */
   public boolean isPerformanceMonitoringEnabled() {
     Boolean isPerformanceCollectionEnabled = getIsPerformanceCollectionEnabled();
-    return (isPerformanceCollectionEnabled == null || isPerformanceCollectionEnabled == true)
+    return (isPerformanceCollectionEnabled == null || isPerformanceCollectionEnabled)
         && getIsServiceCollectionEnabled();
   }
 
@@ -131,7 +131,7 @@ public Boolean getIsPerformanceCollectionEnabled() {
     // return developer config.
     // 4. Else, return null. Because Firebase Performance will read highlevel Firebase flag in this
     // case.
-    if (getIsPerformanceCollectionDeactivated()) {
+    if (Boolean.TRUE.equals(getIsPerformanceCollectionDeactivated())) {
       // 1. If developer has deactivated Firebase Performance in Manifest, return false.
       return false;
     }
@@ -186,7 +186,7 @@ public void setIsPerformanceCollectionEnabled(Boolean isEnabled) {
     // 2. Otherwise, save this configuration in device cache.
 
     // If collection is deactivated, skip the action to save user configuration.
-    if (getIsPerformanceCollectionDeactivated()) {
+    if (Boolean.TRUE.equals(getIsPerformanceCollectionDeactivated())) {
       return;
     }
 

firebase-perf/src/main/java/com/google/firebase/perf/session/FirebasePerformanceSessionSubscriber.kt

@@ -1,17 +1,16 @@
 package com.google.firebase.perf.session
 
-import com.google.firebase.perf.config.ConfigResolver
 import com.google.firebase.perf.logging.AndroidLogger
 import com.google.firebase.perf.session.gauges.GaugeManager
 import com.google.firebase.sessions.api.SessionSubscriber
 
-class FirebasePerformanceSessionSubscriber(private val dataCollectionEnabled: Boolean) :
-  SessionSubscriber {
+class FirebasePerformanceSessionSubscriber() : SessionSubscriber {
   private val perfSessionToAqs: MutableMap<String, SessionSubscriber.SessionDetails?> =
     mutableMapOf()
 
+  // TODO(b/394127311): Identify a way to ste this value after ConfigResolver has relevant metadata.
   override val isDataCollectionEnabled: Boolean
-    get() = dataCollectionEnabled
+    get() = true
 
   override val sessionSubscriberName: SessionSubscriber.Name
     get() = SessionSubscriber.Name.PERFORMANCE
@@ -51,9 +50,7 @@ class FirebasePerformanceSessionSubscriber(private val dataCollectionEnabled: Bo
 
   companion object {
     val instance: FirebasePerformanceSessionSubscriber by lazy {
-      FirebasePerformanceSessionSubscriber(
-        ConfigResolver.getInstance().isPerformanceMonitoringEnabled
-      )
+      FirebasePerformanceSessionSubscriber()
     }
   }
 }

firebase-perf/src/test/java/com/google/firebase/perf/session/SessionManagerTest.java

@@ -16,9 +16,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -40,7 +37,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.AdditionalMatchers;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InOrder;
 import org.mockito.Mock;
@@ -83,7 +79,9 @@ public void setApplicationContext_initializeGaugeMetadataManager()
     testSessionManager.setApplicationContext(mockApplicationContext);
 
     testSessionManager.getSyncInitFuture().get();
-    inOrder.verify(mockGaugeManager).initializeGaugeMetadataManager(any(), ApplicationProcessState.FOREGROUND);
+    inOrder
+        .verify(mockGaugeManager)
+        .initializeGaugeMetadataManager(any(), ApplicationProcessState.FOREGROUND);
   }
 
   @Test