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

Commit d1304302 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... 

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

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

Change-Id: I2ee9bdf97e5861eca262e3a2ccf83ff1530c4983
parents 5b17896c 0b6fff52

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

+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;

            }