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

Merge "Fix NPE in RemoteTransitionCompat" into sc-v2-dev

Browse Source
This commit is contained in:
Chris Li
2021-07-25 18:59:24 +00:00
committed by Android (Google) Code Review
parent fd4beffdda 61e70d323a
commit 9119cb969f
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()), t.setLayer(leashMap.get(change.getLeash()),
info.getChanges().size() * 3 - i); info.getChanges().size() * 3 - i);
final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();
if (taskInfo != null) { if (taskInfo == null) {
pausingTask = change.getTaskInfo().token; continue;
} }
pausingTask = taskInfo.token;
if (taskInfo.pictureInPictureParams != null if (taskInfo.pictureInPictureParams != null
&& taskInfo.pictureInPictureParams.isAutoEnterEnabled()) { && taskInfo.pictureInPictureParams.isAutoEnterEnabled()) {
pipTask = change.getTaskInfo().token; pipTask = taskInfo.token;
} }
} }
} }