Merge "Prevent potential NPE of checking task drawn for logger" into sc-dev am: ad1cfd0db8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14772867

Change-Id: I9799dffcccda1b77f4b79ca58ab818e8b6975c30
This commit is contained in:
Riddle Hsu
2021-05-31 07:53:39 +00:00
committed by Automerger Merge Worker

View File

@@ -780,7 +780,7 @@ class ActivityMetricsLogger {
// window drawn event should report later to complete the transition. Otherwise all
// activities in this task may be finished, invisible or drawn, so the transition event
// should be cancelled.
if (t.forAllActivities(
if (t != null && t.forAllActivities(
a -> a.mVisibleRequested && !a.isReportedDrawn() && !a.finishing)) {
return;
}