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

Unverified Commit fac6a4e4 authored by Michael W's avatar Michael W Committed by Adrian DC
Browse files

SystemUI: Fix possible NPE 

isTaskAboveTask() results in an NPE if the caller is null.
Wrap with null checks on lauchTargetTask and
launchTargetTask.group to prevent this

RM-290

Change-Id: I372ea7744c67ddd11d9731e6bee1858d4dd3318c
Reference: BugDumps 20161021-27 L#77
parent 7a5f5461

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -1018,8 +1018,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 
                t.setClipViewInStack(false);

                t.setClipViewInStack(false);

                t.startLaunchTaskAnimation(r, true, true, lockToTask);

                t.startLaunchTaskAnimation(r, true, true, lockToTask);

            } else {

            } else {

                boolean occludesLaunchTarget = launchTargetTask.group.isTaskAboveTask(t.getTask(),

                boolean occludesLaunchTarget = launchTargetTask != null &&

                        launchTargetTask);

                        launchTargetTask.group != null &&

                        launchTargetTask.group.isTaskAboveTask(t.getTask(), launchTargetTask);

                t.startLaunchTaskAnimation(null, false, occludesLaunchTarget, lockToTask);

                t.startLaunchTaskAnimation(null, false, occludesLaunchTarget, lockToTask);

            }

            }

        }

        }