Don't crash if there's no running task view when going home (37d3a1ff) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -100,10 +100,14 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
		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,

+1 −1

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		setCurrentTask(runningTaskId);
		}

		public TaskView getRunningTaskView() {
		public @Nullable TaskView getRunningTaskView() {
		return getTaskView(mRunningTaskId);
		}