Skip to content

Commit 1722432

Browse files
BadDaemonGerrit Code Review
authored andcommitted
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
1 parent ce521ee commit 1722432

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,8 +1018,9 @@ public void startLaunchTaskAnimation(TaskView tv, Runnable r, boolean lockToTask
10181018
t.setClipViewInStack(false);
10191019
t.startLaunchTaskAnimation(r, true, true, lockToTask);
10201020
} else {
1021-
boolean occludesLaunchTarget = launchTargetTask.group.isTaskAboveTask(t.getTask(),
1022-
launchTargetTask);
1021+
boolean occludesLaunchTarget = launchTargetTask != null &&
1022+
launchTargetTask.group != null &&
1023+
launchTargetTask.group.isTaskAboveTask(t.getTask(), launchTargetTask);
10231024
t.startLaunchTaskAnimation(null, false, occludesLaunchTarget, lockToTask);
10241025
}
10251026
}

0 commit comments

Comments
 (0)