Merge branch 'main' into dependabot/github_actions/dot-github/workflo…

…ws/github_actions-393ff94d45
google · Sep 16, 2024 · e698d9d · e698d9d
2 parents 4aedef0 + b7d212f
commit e698d9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/base/cvd/cuttlefish/host/commands/cvd/server_command/create.cpp b/base/cvd/cuttlefish/host/commands/cvd/server_command/create.cpp
@@ -325,6 +325,7 @@ Result<cvd::Response> CvdCreateCommandHandler::Handle(
   auto group = CF_EXPECT(GetOrCreateGroup(subcmd_args, envs, request));
 
   group.SetAllStates(cvd::INSTANCE_STATE_STOPPED);
+  group.SetStartTime(selector::CvdServerClock::now());
   instance_manager_.UpdateInstanceGroup(group);
 
   cvd::Response response;

diff --git a/base/cvd/cuttlefish/host/commands/cvd/server_command/utils.cpp b/base/cvd/cuttlefish/host/commands/cvd/server_command/utils.cpp
@@ -40,7 +40,7 @@ CommandInvocation ParseInvocation(const cvd::Request& request) {
     invocation.arguments.push_back(arg);
   }
   invocation.arguments[0] = cpp_basename(invocation.arguments[0]);
-  if (invocation.arguments[0] == "cvd") {
+  if (invocation.arguments[0] == "cvd" && invocation.arguments.size() > 1) {
     invocation.command = invocation.arguments[1];
     invocation.arguments.erase(invocation.arguments.begin());
     invocation.arguments.erase(invocation.arguments.begin());