commit 4c3da6b1bb39f95ff936ced0ef3858d4abc971dd
author qctecmdr <qctecmdr@localhost> Wed Sep 30 09:12:07 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 30 09:12:07 2020 -0700
tree e8b1a1c5c57ae938e98b56628dfde56d59bc99c2
parent a56b9f5caf82e419fe6c06ffb3ac9d3166cc6699
parent ae04ce3c15411e4034d3b6dd85f5a56686b196fb

Merge "thermal-hal: Add thermal HAL 2.0 support for sm7150, sm6125 and variants"

thermal.cpp

diff --git a/thermal.cpp b/thermal.cpp
index 1d8cdcb..ea4272a 100644
--- a/thermal.cpp
+++ b/thermal.cpp
@@ -51,6 +51,15 @@
 
 using ::android::hardware::interfacesEqual;
 
+static const Temperature_1_0 dummy_temp_1_0 = {
+	.type = TemperatureType_1_0::SKIN,
+	.name = "test sensor",
+	.currentValue = 30,
+	.throttlingThreshold = 40,
+	.shutdownThreshold = 60,
+	.vrThrottlingThreshold = 40,
+};
+
 template <typename A, typename B>
 Return<void> exit_hal(A _cb, hidl_vec<B> _data, std::string_view _msg) {
 	ThermalStatus _status;
@@ -86,9 +95,12 @@
 	hidl_vec<Temperature_1_0> temperatures;
 
 	status.code = ThermalStatusCode::SUCCESS;
-	if (!utils.isSensorInitialized())
-		return exit_hal(_hidl_cb, temperatures,
-			"ThermalHAL not initialized properly.");
+	if (!utils.isSensorInitialized()) {
+		std::vector<Temperature_1_0> _temp = {dummy_temp_1_0};
+		LOG(INFO) << "Returning Dummy Value" << std::endl;
+		_hidl_cb(status, _temp);
+		return Void();
+	}
 
 	if (utils.readTemperatures(temperatures) <= 0)
 		return exit_hal(_hidl_cb, temperatures,
@@ -106,9 +118,6 @@
 	hidl_vec<CpuUsage> cpu_usages;
 
 	status.code = ThermalStatusCode::SUCCESS;
-	if (!utils.isSensorInitialized())
-		return exit_hal(_hidl_cb, cpu_usages,
-			"ThermalHAL not initialized properly.");
 	if (utils.fetchCpuUsages(cpu_usages) <= 0)
 		return exit_hal(_hidl_cb, cpu_usages,
 				"CPU usage read failure.");
@@ -123,9 +132,6 @@
 	hidl_vec<CoolingDevice_1_0> cdev;
 
 	status.code = ThermalStatusCode::SUCCESS;
-	if (!utils.isCdevInitialized())
-		return exit_hal(_hidl_cb, cdev,
-			"ThermalHAL not initialized properly.");
 	/* V1 Cdev requires only Fan Support. */
 	_hidl_cb(status, cdev);
 	return Void();

thermalCommon.cpp

diff --git a/thermalCommon.cpp b/thermalCommon.cpp
index 6fb0d03..2a3ec38 100644
--- a/thermalCommon.cpp
+++ b/thermalCommon.cpp
@@ -383,7 +383,7 @@
 			" for cdev: " << cdev->c.name;
 		return -1;
 	}
-	cdev->c.value = std::stoi(buf, nullptr, 0);
+	cdev->c.value = std::stoi(buf);
 	LOG(DEBUG) << "cdev Name:" << cdev->c.name << ". state:" <<
 		cdev->c.value << std::endl;
 
@@ -436,7 +436,7 @@
 			" for sensor " << sensor->t.name;
 		return -1;
 	}
-	sensor->t.value = (float)std::stoi(buf, nullptr, 0) / (float)sensor->mulFactor;
+	sensor->t.value = (float)std::stoi(buf) / (float)sensor->mulFactor;
 	LOG(DEBUG) << "Sensor Name:" << sensor->t.name << ". Temperature:" <<
 		(float)sensor->t.value << std::endl;