[skip ci] Merge changes I96a780dd,Ib9784443,Ia8f6138b,Id1cdced0,Ice1d9983, ... into main

* changes: Check for errors from EnsureDirectoryExists/RenameFile sensor_injection: Stop using getService ril: Move from volatile to std::atomic ril: Suppress warnings from libradiocompat VehicleService: Drop unused 'connected' variable websocket: Fix initialization order warnings GitOrigin-RevId: 8adc254

Author: Treehugger Robot

staging/common/libs/utils/files.cpp

@@ -186,7 +186,7 @@ Result<void> EnsureDirectoryExists(const std::string& directory_path,
  }
  const auto parent_dir = android::base::Dirname(directory_path);
  if (parent_dir.size() > 1) {
- EnsureDirectoryExists(parent_dir, mode, group_name);
+ CF_EXPECT(EnsureDirectoryExists(parent_dir, mode, group_name));
  }
  LOG(VERBOSE) << "Setting up " << directory_path;
  if (mkdir(directory_path.c_str(), mode) < 0 && errno != EEXIST) {

staging/host/commands/assemble_cvd/vendor_dlkm_utils.cc

@@ -458,16 +458,20 @@ bool SplitRamdiskModules(const std::string& ramdisk_path,
  if (IsKernelModuleSigned(module_location)) {
  const auto system_dlkm_module_location =
  fmt::format("{}/{}", system_modules_dir, module_path);
- EnsureDirectoryExists(
+ auto res = EnsureDirectoryExists(
  android::base::Dirname(system_dlkm_module_location));
- RenameFile(module_location, system_dlkm_module_location);
+ CHECK(res.ok()) << res.error().FormatForEnv();
+ auto ret = RenameFile(module_location, system_dlkm_module_location);
+ CHECK(ret.ok()) << ret.error().FormatForEnv();
  system_dlkm_modules.emplace(module_path);
  } else {
  const auto vendor_dlkm_module_location =
  fmt::format("{}/{}", vendor_modules_dir, module_path);
- EnsureDirectoryExists(
+ auto res = EnsureDirectoryExists(
  android::base::Dirname(vendor_dlkm_module_location));
- RenameFile(module_location, vendor_dlkm_module_location);
+ CHECK(res.ok()) << res.error().FormatForEnv();
+ auto ret = RenameFile(module_location, vendor_dlkm_module_location);
+ CHECK(ret.ok()) << ret.error().FormatForEnv();
  vendor_dlkm_modules.emplace(module_path);
  }
  }
@@ -492,7 +496,8 @@ bool SplitRamdiskModules(const std::string& ramdisk_path,
  if (FileExists(initramfs_blocklist_path)) {
  const auto vendor_dlkm_blocklist_path =
  fmt::format("{}/{}", vendor_modules_dir, "modules.blocklist");
- RenameFile(initramfs_blocklist_path, vendor_dlkm_blocklist_path);
+ auto ret = RenameFile(initramfs_blocklist_path, vendor_dlkm_blocklist_path);
+ CHECK(ret.ok()) << ret.error().FormatForEnv();
  }
 
  // Write updated modules.dep and modules.load files

staging/host/libs/websocket/websocket_server.cpp

@@ -148,7 +148,6 @@ void WebSocketServer::InitializeLwsObjects() {
  dyn_mounts_.push_back({
  .mount_next = nullptr,
  .mountpoint = path.c_str(),
- .mountpoint_len = static_cast<uint8_t>(path.size()),
  .origin = "__http_polling__",
  .def = nullptr,
  .protocol = nullptr,
@@ -162,6 +161,7 @@ void WebSocketServer::InitializeLwsObjects() {
  .cache_revalidate = 0,
  .cache_intermediaries = 0,
  .origin_protocol = LWSMPRO_CALLBACK, // dynamic
+ .mountpoint_len = static_cast<uint8_t>(path.size()),
  .basic_auth_login_file = nullptr,
  });
  }
@@ -176,7 +176,6 @@ void WebSocketServer::InitializeLwsObjects() {
  static_mount_ = {
  .mount_next = next_mount,
  .mountpoint = "/",
- .mountpoint_len = 1,
  .origin = assets_dir_.c_str(),
  .def = "index.html",
  .protocol = nullptr,
@@ -190,6 +189,7 @@ void WebSocketServer::InitializeLwsObjects() {
  .cache_revalidate = 0,
  .cache_intermediaries = 0,
  .origin_protocol = LWSMPRO_FILE, // files in a dir
+ .mountpoint_len = 1,
  .basic_auth_login_file = nullptr,
  };