Don't crash if there's no running task view when going home
Change-Id: Ib5e9ce961aa4dc6b15da34713967f6ad9dde2054
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
index 408b749..9650a53 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
@@ -100,10 +100,14 @@
public HomeAnimationFactory prepareHomeUI(Launcher activity) {
final DeviceProfile dp = activity.getDeviceProfile();
final RecentsView recentsView = activity.getOverviewPanel();
- final ComponentName component = recentsView.getRunningTaskView().getTask().key
- .sourceComponent;
-
- final View workspaceView = activity.getWorkspace().getFirstMatchForAppClose(component);
+ final TaskView runningTaskView = recentsView.getRunningTaskView();
+ final View workspaceView;
+ if (runningTaskView != null) {
+ ComponentName component = runningTaskView.getTask().key.sourceComponent;
+ workspaceView = activity.getWorkspace().getFirstMatchForAppClose(component);
+ } else {
+ workspaceView = null;
+ }
final Rect iconLocation = new Rect();
final FloatingIconView floatingView = workspaceView == null ? null
: FloatingIconView.getFloatingIconView(activity, workspaceView,
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index a7bf2c3..3e0e8ae 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -773,7 +773,7 @@
setCurrentTask(runningTaskId);
}
- public TaskView getRunningTaskView() {
+ public @Nullable TaskView getRunningTaskView() {
return getTaskView(mRunningTaskId);
}