Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15e091a7 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I9799dffcccda1b77f4b79ca58ab818e8b6975c30
parents 84924257 ad1cfd0d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;
            }