Add null check rootView to fix issue #6367 (#6510)

Fix for issue #6367
firebase · Nov 13, 2024 · 9ae2606 · 9ae2606
1 parent c737e21
commit 9ae2606
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/metrics/AppStartTrace.java b/firebase-perf/src/main/java/com/google/firebase/perf/metrics/AppStartTrace.java
@@ -355,10 +355,12 @@ public synchronized void onActivityResumed(Activity activity) {
     final boolean isExperimentTTIDEnabled = configResolver.getIsExperimentTTIDEnabled();
     if (isExperimentTTIDEnabled) {
       View rootView = activity.findViewById(android.R.id.content);
-      rootView.getViewTreeObserver().addOnDrawListener(onDrawCounterListener);
-      FirstDrawDoneListener.registerForNextDraw(rootView, this::recordOnDrawFrontOfQueue);
-      PreDrawListener.registerForNextDraw(
-          rootView, this::recordPreDraw, this::recordPreDrawFrontOfQueue);
+      if (rootView != null) {
+        rootView.getViewTreeObserver().addOnDrawListener(onDrawCounterListener);
+        FirstDrawDoneListener.registerForNextDraw(rootView, this::recordOnDrawFrontOfQueue);
+        PreDrawListener.registerForNextDraw(
+            rootView, this::recordPreDraw, this::recordPreDrawFrontOfQueue);
+      }
     }
 
     if (onResumeTime != null) { // An activity already called onResume()
@@ -444,7 +446,9 @@ public void onActivityPaused(Activity activity) {
       return;
     }
     View rootView = activity.findViewById(android.R.id.content);
-    rootView.getViewTreeObserver().removeOnDrawListener(onDrawCounterListener);
+    if (rootView != null) {
+      rootView.getViewTreeObserver().removeOnDrawListener(onDrawCounterListener);
+    }
   }
 
   @Override