From 61e70d323a4cbfe55122e6027e5f218309cfe8e8 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Sat, 24 Jul 2021 12:57:01 -0700 Subject: [PATCH] Fix NPE in RemoteTransitionCompat Bug: 193565751 Test: pass failed launcher test with shell transition Change-Id: I1f876c1486cc68ce9aa409ea973f5db7e7f58efd --- .../systemui/shared/system/RemoteTransitionCompat.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java index 7f2d252cd73b4..2519284c5f43a 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java @@ -131,12 +131,13 @@ public class RemoteTransitionCompat implements Parcelable { t.setLayer(leashMap.get(change.getLeash()), info.getChanges().size() * 3 - i); final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); - if (taskInfo != null) { - pausingTask = change.getTaskInfo().token; + if (taskInfo == null) { + continue; } + pausingTask = taskInfo.token; if (taskInfo.pictureInPictureParams != null && taskInfo.pictureInPictureParams.isAutoEnterEnabled()) { - pipTask = change.getTaskInfo().token; + pipTask = taskInfo.token; } } }