Fix the implementation.

Author: visumickey

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

@@ -71,7 +71,7 @@ public void onSessionChanged(@NonNull SessionDetails sessionDetails) {
           public boolean isDataCollectionEnabled() {
             // If there is no cached config data available for data collection, be conservative.
             // Return false.
-            if (!configResolver.isCollectionEnabledCacheAvailable()) {
+            if (!configResolver.isCollectionEnabledConfigValueAvailable()) {
               return false;
             }
             return ConfigResolver.getInstance().isPerformanceMonitoringEnabled();

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

@@ -156,9 +156,13 @@ public Boolean getIsPerformanceCollectionEnabled() {
     return null;
   }
 
-  public boolean isCollectionEnabledCacheAvailable() {
+  /**
+   * Returns whether data collection flag is fetched either through device cache or remote config.
+   */
+  public boolean isCollectionEnabledConfigValueAvailable() {
+    Optional<Boolean> remoteConfigValue = getRemoteConfigBoolean(SdkEnabled.getInstance());
     Optional<Boolean> deviceCacheValue = getDeviceCacheBoolean(CollectionEnabled.getInstance());
-    return deviceCacheValue.isAvailable();
+    return deviceCacheValue.isAvailable() || remoteConfigValue.isAvailable();
   }
 
   /** Returns whether developers have deactivated Firebase Performance event collection. */

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

@@ -498,17 +498,80 @@ public void getIsServiceCollectionEnabled_sdkDisabledVersionFlagNoFrc_returnDefa
   }
 
   @Test
-  public void getIsPerformanceCollectionCacheAvailable_noDeviceCache_returnsFalse() {
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_noDeviceCacheNoRemoteConfig_returnsFalse() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.absent());
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.absent());
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isFalse();
+  }
+
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_noDeviceCacheHasRemoteConfigValueFalse_returnsTrue() {
     when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
         .thenReturn(Optional.absent());
-    assertThat(testConfigResolver.isCollectionEnabledCacheAvailable()).isFalse();
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(false));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
   }
 
   @Test
-  public void getIsPerformanceCollectionCacheAvailable_hasDeviceCache_returnsTrue() {
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_HasDeviceCacheNoRemoteConfigValue_returnsTrue() {
     when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(false));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.absent());
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
+
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_HasDeviceCacheFalseHasRemoteConfigValueFalse_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(false));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(false));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
+
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_noDeviceCacheHasRemoteConfigValueTrue_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(false));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(true));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
+
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_hasDeviceCacheHasRemoteConfigValueFalse_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(true));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
+        .thenReturn(Optional.of(false));
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
+  }
+
+  @Test
+  public void
+      getIsPerformanceCollectionConfigValueAvailable_hasDeviceCacheHasRemoteConfig_returnsTrue() {
+    when(mockDeviceCacheManager.getBoolean(FIREBASE_PERFORMANCE_COLLECTION_ENABLED_CACHE_KEY))
+        .thenReturn(Optional.of(true));
+    when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(false);
+    when(mockRemoteConfigManager.getBoolean(FIREBASE_PERFORMANCE_SDK_ENABLED_FRC_KEY))
         .thenReturn(Optional.of(true));
-    assertThat(testConfigResolver.isCollectionEnabledCacheAvailable()).isTrue();
+    assertThat(testConfigResolver.isCollectionEnabledConfigValueAvailable()).isTrue();
   }
 
   @Test