Merge "Add warning about AIDL CAN HAL"

This commit is contained in:
Chris Weir
2022-12-17 01:46:04 +00:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 2 deletions

View File

@@ -70,6 +70,9 @@ static bool processPbCfg(const config::CanBusConfig& pb_cfg) {
static bool configuratorStart(const std::string& filepath) {
base::SetDefaultTag("CanConfigurator");
LOG(WARNING) << "The HIDL version of CAN HAL has been deprecated, if this tool fails with "
<< "SIGABRT, you may need canhalconfigurator-aidl instead.";
auto pb_cfg = config::parseConfigFile(filepath);
if (!pb_cfg.has_value()) {
return false;

View File

@@ -34,8 +34,8 @@ hidl_vec<hidl_string> getControlServices() {
auto manager = hidl::manager::V1_2::IServiceManager::getService();
hidl_vec<hidl_string> services;
manager->listManifestByInterface(ICanController::descriptor, hidl_utils::fill(&services));
CHECK(services.size() > 0) << "No ICanController services registered (missing privileges?)"
<< std::endl;
CHECK(services.size() > 0) << "No ICanController services registered (missing privileges?). "
<< "are you using the AIDL CanController?" << std::endl;
return services;
}