From 1d581bcb094291114b2f4ffaa6a1e2ef924019b1 Mon Sep 17 00:00:00 2001 From: Winson Date: Mon, 13 Jun 2016 12:14:45 -0700 Subject: [PATCH] Ensuring we don't try and dismiss task views that are already removed. Bug: 29240786 Change-Id: I724e7c366b2fb835fd81fa966689f999953ef4c8 --- .../systemui/recents/views/RecentsTransitionHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java index 41869dd5f417f..e503c56437a4e 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java @@ -209,7 +209,9 @@ public class RecentsTransitionHelper { EventBus.getDefault().send(new LaunchTaskSucceededEvent(taskIndexFromFront)); } else { // Dismiss the task if we fail to launch it - taskView.dismissTask(); + if (taskView != null) { + taskView.dismissTask(); + } // Keep track of failed launches EventBus.getDefault().send(new LaunchTaskFailedEvent());