Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad8a47bd authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in RemoteTransitionCompat" into sc-v2-dev am: 9119cb96 

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

Change-Id: I06d991b27152c595ac590a1d8067a5fc807ccb67
parents d4159ebf 9119cb96

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

+4 −3
Original line number Diff line number Diff line
@@ -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;

                        }

                    }

                }