Merge "Adjust mock thermal HAL 2.0 mock data" (8ee0a26f) · Commits · e / os / android_hardware_interfaces

thermal/2.0/default/Thermal.cpp

+26 −25

Original line number	Diff line number	Diff line
		@@ -38,27 +38,28 @@ using ::android::hardware::thermal::V1_0::ThermalStatusCode;
		std::set<sp<IThermalChangedCallback>> gCallbacks;

		static const Temperature_1_0 kTemp_1_0 = {
		.type = static_cast<::android::hardware::thermal::V1_0::TemperatureType>(TemperatureType::CPU),
		.type = static_cast<::android::hardware::thermal::V1_0::TemperatureType>(
		TemperatureType::SKIN),
		.name = "test temperature sensor",
		.currentValue = 98.6,
		.throttlingThreshold = 58,
		.currentValue = 30.8,
		.throttlingThreshold = 48.0,
		.shutdownThreshold = 60.0,
		.vrThrottlingThreshold = 59.0,
		.vrThrottlingThreshold = 49.0,
		};

		static const Temperature_2_0 kTemp_2_0 = {
		.type = TemperatureType::SKIN,
		.name = "test temperature sensor",
		.value = 98.6,
		.throttlingStatus = ThrottlingSeverity::CRITICAL,
		.value = 30.8,
		.throttlingStatus = ThrottlingSeverity::NONE,
		};

		static const TemperatureThreshold kTempThreshold = {
		.type = TemperatureType::SKIN,
		.name = "test temperature sensor",
		.hotThrottlingThresholds = {{NAN, NAN, NAN, NAN, NAN, NAN, NAN}},
		.hotThrottlingThresholds = {{NAN, NAN, NAN, 48.0, NAN, NAN, 60.0}},
		.coldThrottlingThresholds = {{NAN, NAN, NAN, NAN, NAN, NAN, NAN}},
		.vrThrottlingThreshold = NAN,
		.vrThrottlingThreshold = 49.0,
		};

		static const CoolingDevice_1_0 kCooling_1_0 = {
		@@ -68,9 +69,9 @@ static const CoolingDevice_1_0 kCooling_1_0 = {
		};

		static const CoolingDevice_2_0 kCooling_2_0 = {
		.type = CoolingType::CPU,
		.type = CoolingType::FAN,
		.name = "test cooling device",
		.value = 1,
		.value = 100,
		};

		static const CpuUsage kCpuUsage = {