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

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
index 602a0ff639a9..a781520c48d9 100644
--- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -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;
             }