commit c169a9d8a1d55a148bc4775a334ff920dea90e70
author Winson Chung <winsonc@google.com> Mon Jun 13 21:06:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 13 21:06:39 2016 +0000
tree 498b10e29e8942df056cd1fbd9d4a8316c532967
parent 51487f06f92aa84b5b42b9c3bc43582891de5d72
parent 1d581bcb094291114b2f4ffaa6a1e2ef924019b1

Merge "Ensuring we don't try and dismiss task views that are already removed." into nyc-dev

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

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 41869dd..e503c56 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 @@
             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());