From 17224324b86e0f5486741921355c29cd6baa0f51 Mon Sep 17 00:00:00 2001 From: Michael W Date: Fri, 28 Oct 2016 12:52:04 +0200 Subject: 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 Change-Id: I372ea7744c67ddd11d9731e6bee1858d4dd3318c Reference: BugDumps 20161021-27 L#77 --- .../src/com/android/systemui/recents/views/TaskStackView.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 43b9a3e..454222c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -1018,8 +1018,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal t.setClipViewInStack(false); t.startLaunchTaskAnimation(r, true, true, lockToTask); } else { - boolean occludesLaunchTarget = launchTargetTask.group.isTaskAboveTask(t.getTask(), - launchTargetTask); + boolean occludesLaunchTarget = launchTargetTask != null && + launchTargetTask.group != null && + launchTargetTask.group.isTaskAboveTask(t.getTask(), launchTargetTask); t.startLaunchTaskAnimation(null, false, occludesLaunchTarget, lockToTask); } } -- cgit v1.1