use FirebasePerfProvider.getAppStartTime

Author: leotianlizhan

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

@@ -22,6 +22,7 @@
 import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.provider.FirebasePerfProvider;
 import com.google.firebase.perf.util.Optional;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue;
@@ -93,7 +94,8 @@ private RemoteConfigManager() {
         firebaseRemoteConfig == null
             ? new ConcurrentHashMap<>()
             : new ConcurrentHashMap<>(firebaseRemoteConfig.getAll());
-    this.appStartTimeInMs = getCurrentSystemTimeMillis();
+    this.appStartTimeInMs =
+        TimeUnit.MICROSECONDS.toMillis(FirebasePerfProvider.getAppStartTime().getMicros());
     this.appStartConfigFetchDelayInMs = appStartConfigFetchDelayInMs;
   }
 

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

@@ -27,6 +27,7 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.perf.FirebasePerformanceTestBase;
+import com.google.firebase.perf.provider.FirebasePerfProvider;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
@@ -808,8 +809,10 @@ public void triggerRemoteConfigFetchIfNecessary_doesNotFetchBeforeAppStartRandom
                 appStartConfigFetchDelay));
 
     // Simulate time fast forward to some time before fetch time is up
+    long appStartTimeInMs =
+        TimeUnit.MICROSECONDS.toMillis(FirebasePerfProvider.getAppStartTime().getMicros());
     when(remoteConfigManagerPartialMock.getCurrentSystemTimeMillis())
-        .thenReturn(System.currentTimeMillis() + appStartConfigFetchDelay - 2000);
+        .thenReturn(appStartTimeInMs + appStartConfigFetchDelay - 2000);
 
     simulateFirebaseRemoteConfigLastFetchStatus(
         FirebaseRemoteConfig.LAST_FETCH_STATUS_NO_FETCH_YET);
@@ -833,8 +836,10 @@ public void triggerRemoteConfigFetchIfNecessary_fetchesAfterAppStartRandomDelay(
                 appStartConfigFetchDelay));
 
     // Simulate time fast forward to 2s after fetch delay time is up
+    long appStartTimeInMs =
+        TimeUnit.MICROSECONDS.toMillis(FirebasePerfProvider.getAppStartTime().getMicros());
     when(remoteConfigManagerPartialMock.getCurrentSystemTimeMillis())
-        .thenReturn(System.currentTimeMillis() + appStartConfigFetchDelay + 2000);
+        .thenReturn(appStartTimeInMs + appStartConfigFetchDelay + 2000);
 
     simulateFirebaseRemoteConfigLastFetchStatus(
         FirebaseRemoteConfig.LAST_FETCH_STATUS_NO_FETCH_YET);