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

Commit 9119cb96 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

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

parents fd4beffd 61e70d32

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;

                        }

                    }

                }