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

Fix NPE in RemoteTransitionCompat

Browse Source 
Bug: 193565751
Test: pass failed launcher test with shell transition
Change-Id: I1f876c1486cc68ce9aa409ea973f5db7e7f58efd
This commit is contained in:
Chris Li
2021-07-24 12:57:01 -07:00
parent c9d779caa3
commit 61e70d323a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.java
View File

@@ -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;
}
}
}