Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I32bb86e1c8f41ca9e612e841cb8df01b435c365b
This commit is contained in:
Riddle Hsu
2021-05-31 07:37:26 +00:00
committed by Automerger Merge Worker
parent 823c7e9a01 ad1cfd0db8
commit 0b6fff5266
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityMetricsLogger.java
View File

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