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 am: 0b6fff5266 am: d130430288

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

Change-Id: I0fe87ac07d9ce28b1c0f00a40e8abbe14ae070f2
This commit is contained in:
Riddle Hsu
2021-05-31 08:25:14 +00:00
committed by Automerger Merge Worker
parent c219ff22e6 d130430288
commit 8db94b4d8b
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
// 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;
}