Skip to content

Commit 63f2cde

Browse files
committed
Add null check rootView to fix issue #6367
1 parent c737e21 commit 63f2cde

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

firebase-perf/src/main/java/com/google/firebase/perf/metrics/AppStartTrace.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,12 @@ public synchronized void onActivityResumed(Activity activity) {
355355
final boolean isExperimentTTIDEnabled = configResolver.getIsExperimentTTIDEnabled();
356356
if (isExperimentTTIDEnabled) {
357357
View rootView = activity.findViewById(android.R.id.content);
358-
rootView.getViewTreeObserver().addOnDrawListener(onDrawCounterListener);
359-
FirstDrawDoneListener.registerForNextDraw(rootView, this::recordOnDrawFrontOfQueue);
360-
PreDrawListener.registerForNextDraw(
361-
rootView, this::recordPreDraw, this::recordPreDrawFrontOfQueue);
358+
if (rootView != null) {
359+
rootView.getViewTreeObserver().addOnDrawListener(onDrawCounterListener);
360+
FirstDrawDoneListener.registerForNextDraw(rootView, this::recordOnDrawFrontOfQueue);
361+
PreDrawListener.registerForNextDraw(
362+
rootView, this::recordPreDraw, this::recordPreDrawFrontOfQueue);
363+
}
362364
}
363365

364366
if (onResumeTime != null) { // An activity already called onResume()
@@ -444,7 +446,9 @@ public void onActivityPaused(Activity activity) {
444446
return;
445447
}
446448
View rootView = activity.findViewById(android.R.id.content);
447-
rootView.getViewTreeObserver().removeOnDrawListener(onDrawCounterListener);
449+
if (rootView != null) {
450+
rootView.getViewTreeObserver().removeOnDrawListener(onDrawCounterListener);
451+
}
448452
}
449453

450454
@Override

0 commit comments

Comments
 (0)