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 am: 9119cb969f am: ad8a47bdf0

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

Change-Id: Ia862cd8e2c207d1699bfd43bfabb98f20cfb5254
This commit is contained in:
Chris Li
2021-07-25 19:59:36 +00:00
committed by Automerger Merge Worker
parent eb66b48e39 ad8a47bdf0
commit c689abb725
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;
}
}
}