Skip to content

Commit ce7c779

Browse files
Fix hasFrameMetricsAggregator's value not being set.
1 parent 81eb629 commit ce7c779

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateMonitor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class AppStateMonitor implements ActivityLifecycleCallbacks {
5353
"androidx.core.app.FrameMetricsAggregator";
5454

5555
private static volatile AppStateMonitor instance;
56+
private static boolean hasFrameMetricsAggregator = false;
5657

5758
private final WeakHashMap<Activity, Boolean> activityToResumedMap = new WeakHashMap<>();
5859
private final WeakHashMap<Activity, Trace> activityToScreenTraceMap = new WeakHashMap<>();
@@ -76,7 +77,6 @@ public class AppStateMonitor implements ActivityLifecycleCallbacks {
7677

7778
private boolean isRegisteredForLifecycleCallbacks = false;
7879
private boolean isColdStart = true;
79-
private boolean hasFrameMetricsAggregator = false;
8080

8181
public static AppStateMonitor getInstance() {
8282
if (instance == null) {
@@ -213,7 +213,7 @@ public synchronized void onActivityResumed(Activity activity) {
213213
}
214214

215215
// Screen trace is after session update so the sessionId is not added twice to the Trace
216-
if (isScreenTraceSupported(activity) && configResolver.isPerformanceMonitoringEnabled()) {
216+
if (isScreenTraceSupported() && configResolver.isPerformanceMonitoringEnabled()) {
217217
// Starts recording frame metrics for this activity.
218218
/**
219219
* TODO: Only add activities that are hardware acceleration enabled so that calling {@link
@@ -453,8 +453,10 @@ protected boolean isScreenTraceSupported() {
453453
private static boolean hasFrameMetricsAggregatorClass() {
454454
try {
455455
Class<?> initializerClass = Class.forName(FRAME_METRICS_AGGREGATOR_CLASSNAME);
456+
hasFrameMetricsAggregator = true;
456457
return true;
457458
} catch (ClassNotFoundException e) {
459+
hasFrameMetricsAggregator = false;
458460
return false;
459461
}
460462
}

firebase-perf/src/main/java/com/google/firebase/perf/application/FragmentStateMonitor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ public void onFragmentPaused(@NonNull FragmentManager fm, @NonNull Fragment f) {
8383
// Stop Fragment screen trace
8484
logger.debug("FragmentMonitor %s.onFragmentPaused ", f.getClass().getSimpleName());
8585
if (!fragmentToTraceMap.containsKey(f)) {
86-
logger.warn(
87-
"FragmentMonitor: missed a fragment trace from %s", f.getClass().getSimpleName());
86+
logger.warn("FragmentMonitor: missed a fragment trace from %s", f.getClass().getSimpleName());
8887
return;
8988
}
9089

0 commit comments

Comments
 (0)