Add Thermal HAL VTS
Bug: 32022734
Test: vts
Change-Id: I29ecd8b9da8275674343bce73c9f9deb20692bf2
diff --git a/thermal/1.0/default/Thermal.cpp b/thermal/1.0/default/Thermal.cpp
index 1b91687..6c2111f 100644
--- a/thermal/1.0/default/Thermal.cpp
+++ b/thermal/1.0/default/Thermal.cpp
@@ -20,6 +20,7 @@
#include <errno.h>
#include <hardware/hardware.h>
#include <hardware/thermal.h>
+#include <vector>
#include "Thermal.h"
@@ -29,173 +30,167 @@
namespace V1_0 {
namespace implementation {
-Thermal::Thermal(thermal_module_t* module) : mModule(module) {
-}
+Thermal::Thermal(thermal_module_t* module) : mModule(module) {}
// Methods from ::android::hardware::thermal::V1_0::IThermal follow.
-Return<void> Thermal::getTemperatures(getTemperatures_cb _hidl_cb) {
- ThermalStatus status;
- status.code = ThermalStatusCode::SUCCESS;
- hidl_vec<Temperature> temperatures;
+Return<void> Thermal::getTemperatures(getTemperatures_cb _hidl_cb) {
+ ThermalStatus status;
+ status.code = ThermalStatusCode::SUCCESS;
+ hidl_vec<Temperature> temperatures;
- if (!mModule || !mModule->getTemperatures) {
- ALOGI("getTemperatures is not implemented in Thermal HAL.");
- _hidl_cb(status, temperatures);
- return Void();
- }
-
- ssize_t list_size = mModule->getTemperatures(mModule, nullptr, 0);
- if (list_size >= 0) {
- temperature_t *list = new temperature_t[list_size];
- ssize_t size = mModule->getTemperatures(mModule, list, list_size);
- if (size >= 0) {
- if (list_size > size) {
- list_size = size;
- }
-
- temperatures.resize(list_size);
- for (ssize_t i = 0; i < list_size; ++i) {
- switch (list[i].type) {
- case DEVICE_TEMPERATURE_UNKNOWN:
- temperatures[i].type = TemperatureType::UNKNOWN;
- break;
- case DEVICE_TEMPERATURE_CPU:
- temperatures[i].type = TemperatureType::CPU;
- break;
- case DEVICE_TEMPERATURE_GPU:
- temperatures[i].type = TemperatureType::GPU;
- break;
- case DEVICE_TEMPERATURE_BATTERY:
- temperatures[i].type = TemperatureType::BATTERY;
- break;
- case DEVICE_TEMPERATURE_SKIN:
- temperatures[i].type = TemperatureType::SKIN;
- break;
- default:
- ALOGE("Unknown temperature %s type", list[i].name);;
- }
- temperatures[i].name = list[i].name;
- temperatures[i].currentValue = list[i].current_value;
- temperatures[i].throttlingThreshold = list[i].throttling_threshold;
- temperatures[i].shutdownThreshold = list[i].shutdown_threshold;
- temperatures[i].vrThrottlingThreshold = list[i].vr_throttling_threshold;
- }
- } else {
- status.code = ThermalStatusCode::FAILURE;
- status.debugMessage = strerror(-size);
- }
- delete[] list;
- } else {
- status.code = ThermalStatusCode::FAILURE;
- status.debugMessage = strerror(-list_size);
- }
+ if (!mModule || !mModule->getTemperatures) {
+ ALOGI("getTemperatures is not implemented in Thermal HAL.");
_hidl_cb(status, temperatures);
return Void();
+ }
+
+ ssize_t size = mModule->getTemperatures(mModule, nullptr, 0);
+ if (size >= 0) {
+ std::vector<temperature_t> list;
+ list.resize(size);
+ size = mModule->getTemperatures(mModule, list.data(), list.size());
+ if (size >= 0) {
+ temperatures.resize(list.size());
+ for (size_t i = 0; i < list.size(); ++i) {
+ switch (list[i].type) {
+ case DEVICE_TEMPERATURE_UNKNOWN:
+ temperatures[i].type = TemperatureType::UNKNOWN;
+ break;
+ case DEVICE_TEMPERATURE_CPU:
+ temperatures[i].type = TemperatureType::CPU;
+ break;
+ case DEVICE_TEMPERATURE_GPU:
+ temperatures[i].type = TemperatureType::GPU;
+ break;
+ case DEVICE_TEMPERATURE_BATTERY:
+ temperatures[i].type = TemperatureType::BATTERY;
+ break;
+ case DEVICE_TEMPERATURE_SKIN:
+ temperatures[i].type = TemperatureType::SKIN;
+ break;
+ default:
+ ALOGE("Unknown temperature %s type", list[i].name);
+ ;
+ }
+ temperatures[i].name = list[i].name;
+ temperatures[i].currentValue = list[i].current_value;
+ temperatures[i].throttlingThreshold = list[i].throttling_threshold;
+ temperatures[i].shutdownThreshold = list[i].shutdown_threshold;
+ temperatures[i].vrThrottlingThreshold = list[i].vr_throttling_threshold;
+ }
+ }
+ }
+ if (size < 0) {
+ status.code = ThermalStatusCode::FAILURE;
+ status.debugMessage = strerror(-size);
+ }
+ _hidl_cb(status, temperatures);
+ return Void();
}
-Return<void> Thermal::getCpuUsages(getCpuUsages_cb _hidl_cb) {
- ThermalStatus status;
- hidl_vec<CpuUsage> cpuUsages;
- status.code = ThermalStatusCode::SUCCESS;
+Return<void> Thermal::getCpuUsages(getCpuUsages_cb _hidl_cb) {
+ ThermalStatus status;
+ hidl_vec<CpuUsage> cpuUsages;
+ status.code = ThermalStatusCode::SUCCESS;
- if (!mModule || !mModule->getCpuUsages) {
- ALOGI("getCpuUsages is not implemented in Thermal HAL");
- _hidl_cb(status, cpuUsages);
- return Void();
- }
-
- ssize_t size = mModule->getCpuUsages(mModule, nullptr);
- if (size >= 0) {
- cpu_usage_t *list = new cpu_usage_t[size];
- size = mModule->getCpuUsages(mModule, list);
- if (size >= 0) {
- cpuUsages.resize(size);
- for (ssize_t i = 0; i < size; ++i) {
- cpuUsages[i].name = list[i].name;
- cpuUsages[i].active = list[i].active;
- cpuUsages[i].total = list[i].total;
- cpuUsages[i].isOnline = list[i].is_online;
- }
- } else {
- status.code = ThermalStatusCode::FAILURE;
- status.debugMessage = strerror(-size);
- }
- delete[] list;
- } else {
- status.code = ThermalStatusCode::FAILURE;
- status.debugMessage = strerror(-size);
- }
+ if (!mModule || !mModule->getCpuUsages) {
+ ALOGI("getCpuUsages is not implemented in Thermal HAL");
_hidl_cb(status, cpuUsages);
return Void();
+ }
+
+ ssize_t size = mModule->getCpuUsages(mModule, nullptr);
+ if (size >= 0) {
+ std::vector<cpu_usage_t> list;
+ list.resize(size);
+ size = mModule->getCpuUsages(mModule, list.data());
+ if (size >= 0) {
+ list.resize(size);
+ cpuUsages.resize(size);
+ for (size_t i = 0; i < list.size(); ++i) {
+ cpuUsages[i].name = list[i].name;
+ cpuUsages[i].active = list[i].active;
+ cpuUsages[i].total = list[i].total;
+ cpuUsages[i].isOnline = list[i].is_online;
+ }
+ } else {
+ status.code = ThermalStatusCode::FAILURE;
+ status.debugMessage = strerror(-size);
+ }
+ }
+ if (size < 0) {
+ status.code = ThermalStatusCode::FAILURE;
+ status.debugMessage = strerror(-size);
+ }
+ _hidl_cb(status, cpuUsages);
+ return Void();
}
-Return<void> Thermal::getCoolingDevices(getCoolingDevices_cb _hidl_cb) {
- ThermalStatus status;
- status.code = ThermalStatusCode::SUCCESS;
- hidl_vec<CoolingDevice> coolingDevices;
+Return<void> Thermal::getCoolingDevices(getCoolingDevices_cb _hidl_cb) {
+ ThermalStatus status;
+ status.code = ThermalStatusCode::SUCCESS;
+ hidl_vec<CoolingDevice> coolingDevices;
- if (!mModule || !mModule->getCoolingDevices) {
- ALOGI("getCoolingDevices is not implemented in Thermal HAL.");
- _hidl_cb(status, coolingDevices);
- return Void();
- }
-
- ssize_t list_size = mModule->getCoolingDevices(mModule, nullptr, 0);
- if (list_size >= 0) {
- cooling_device_t *list = new cooling_device_t[list_size];
- ssize_t size = mModule->getCoolingDevices(mModule, list, list_size);
- if (size >= 0) {
- if (list_size > size) {
- list_size = size;
- }
- coolingDevices.resize(list_size);
- for (ssize_t i = 0; i < list_size; ++i) {
- switch (list[i].type) {
- case FAN_RPM:
- coolingDevices[i].type = CoolingType::FAN_RPM;
- break;
- default:
- ALOGE("Unknown cooling device %s type", list[i].name);
- }
- coolingDevices[i].name = list[i].name;
- coolingDevices[i].currentValue = list[i].current_value;
- }
-
- } else {
- status.code = ThermalStatusCode::FAILURE;
- status.debugMessage = strerror(-size);
- }
- delete[] list;
- } else {
- status.code = ThermalStatusCode::FAILURE;
- status.debugMessage = strerror(-list_size);
- }
+ if (!mModule || !mModule->getCoolingDevices) {
+ ALOGI("getCoolingDevices is not implemented in Thermal HAL.");
_hidl_cb(status, coolingDevices);
return Void();
+ }
+
+ ssize_t size = mModule->getCoolingDevices(mModule, nullptr, 0);
+ if (size >= 0) {
+ std::vector<cooling_device_t> list;
+ list.resize(size);
+ size = mModule->getCoolingDevices(mModule, list.data(), list.size());
+ if (size >= 0) {
+ list.resize(size);
+ coolingDevices.resize(list.size());
+ for (size_t i = 0; i < list.size(); ++i) {
+ switch (list[i].type) {
+ case FAN_RPM:
+ coolingDevices[i].type = CoolingType::FAN_RPM;
+ break;
+ default:
+ ALOGE("Unknown cooling device %s type", list[i].name);
+ }
+ coolingDevices[i].name = list[i].name;
+ coolingDevices[i].currentValue = list[i].current_value;
+ }
+ }
+ }
+ if (size < 0) {
+ status.code = ThermalStatusCode::FAILURE;
+ status.debugMessage = strerror(-size);
+ }
+ _hidl_cb(status, coolingDevices);
+ return Void();
}
IThermal* HIDL_FETCH_IThermal(const char* /* name */) {
- thermal_module_t* module;
- status_t err = hw_get_module(THERMAL_HARDWARE_MODULE_ID,
- const_cast<hw_module_t const**>(reinterpret_cast<hw_module_t**>(&module)));
- if (err || !module) {
- ALOGE("Couldn't load %s module (%s)", THERMAL_HARDWARE_MODULE_ID,
- strerror(-err));
- }
+ thermal_module_t* module;
+ status_t err = hw_get_module(THERMAL_HARDWARE_MODULE_ID,
+ const_cast<hw_module_t const**>(
+ reinterpret_cast<hw_module_t**>(&module)));
+ if (err || !module) {
+ ALOGE("Couldn't load %s module (%s)", THERMAL_HARDWARE_MODULE_ID,
+ strerror(-err));
+ }
- if (err == 0 && module->common.methods->open) {
- struct hw_device_t* device;
- err = module->common.methods->open(&module->common, THERMAL_HARDWARE_MODULE_ID, &device);
- if (err) {
- ALOGE("Couldn't open %s module (%s)", THERMAL_HARDWARE_MODULE_ID, strerror(-err));
- } else {
- return new Thermal(reinterpret_cast<thermal_module_t*>(device));
- }
+ if (err == 0 && module->common.methods->open) {
+ struct hw_device_t* device;
+ err = module->common.methods->open(&module->common,
+ THERMAL_HARDWARE_MODULE_ID, &device);
+ if (err) {
+ ALOGE("Couldn't open %s module (%s)", THERMAL_HARDWARE_MODULE_ID,
+ strerror(-err));
+ } else {
+ return new Thermal(reinterpret_cast<thermal_module_t*>(device));
}
- return new Thermal(module);
+ }
+ return new Thermal(module);
}
-} // namespace implementation
+} // namespace implementation
} // namespace V1_0
} // namespace thermal
} // namespace hardware