Merge "Fix typo in Thermal AIDL interface and run update API" (2acfb5dd) · Commits · e / os / android_hardware_interfaces

thermal/aidl/aidl_api/android.hardware.thermal/current/android/hardware/thermal/CoolingType.aidl

+11 −11

Original line number	Diff line number	Diff line
		@@ -35,15 +35,15 @@ package android.hardware.thermal;
		/* @hide */
		@Backing(type="int") @VintfStability
		enum CoolingType {
		FAN = 0,
		BATTERY = 1,
		CPU = 2,
		GPU = 3,
		MODEM = 4,
		NPU = 5,
		COMPONENT = 6,
		TPU = 7,
		POWER_AMPLIFIER = 8,
		DISPLAY = 9,
		SPEAKER = 10,
		FAN,
		BATTERY,
		CPU,
		GPU,
		MODEM,
		NPU,
		COMPONENT,
		TPU,
		POWER_AMPLIFIER,
		DISPLAY,
		SPEAKER,
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ package android.hardware.thermal;
		/* @hide */
		@Backing(type="int") @VintfStability
		enum TemperatureType {
		UNKNOWN = -1,
		UNKNOWN = (-1),
		CPU = 0,
		GPU = 1,
		BATTERY = 2,

+6 −6

Original line number	Diff line number	Diff line
		@@ -36,10 +36,10 @@ package android.hardware.thermal;
		@Backing(type="int") @VintfStability
		enum ThrottlingSeverity {
		NONE = 0,
		LIGHT = 1,
		MODERATE = 2,
		SEVERE = 3,
		CRITICAL = 4,
		EMERGENCY = 5,
		SHUTDOWN = 6,
		LIGHT,
		MODERATE,
		SEVERE,
		CRITICAL,
		EMERGENCY,
		SHUTDOWN,
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -104,9 +104,9 @@ interface IThermal {
		* they go offline, if these devices exist on boot. The method
		* always returns and never removes such temperatures. The thresholds
		* are returned as static values and must not change across calls. The actual
		* throttling state is determined in device thermal mitigation policy/agorithm
		* throttling state is determined in device thermal mitigation policy/algorithm
		* which might not be simple thresholds so these values Thermal HAL provided
		* may not be accurate to detemin the throttling status. To get accurate
		* may not be accurate to determine the throttling status. To get accurate
		* throttling status, use getTemperatures or registerThermalChangedCallback
		* and listen to the callback.
		*
		@@ -129,9 +129,9 @@ interface IThermal {
		* they go offline, if these devices exist on boot. The method
		* always returns and never removes such temperatures. The thresholds
		* are returned as static values and must not change across calls. The actual
		* throttling state is determined in device thermal mitigation policy/agorithm
		* throttling state is determined in device thermal mitigation policy/algorithm
		* which might not be simple thresholds so these values Thermal HAL provided
		* may not be accurate to detemin the throttling status. To get accurate
		* may not be accurate to determine the throttling status. To get accurate
		* throttling status, use getTemperatures or registerThermalChangedCallback
		* and listen to the callback.
		*

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ parcelable TemperatureThreshold {
		* level defined in ThrottlingSeverity including shutdown. Throttling
		* happens when temperature >= threshold. If not available, set to NAN.
		* Unit is same as Temperature's value.
		* The number of thresholds must be the same as ThrottlingSeverity#len.
		* The array size must be the same as ThrottlingSeverity's enum cardinality.
		*/
		float[] hotThrottlingThresholds;
		/**
		@@ -44,7 +44,7 @@ parcelable TemperatureThreshold {
		* level defined in ThrottlingSeverity including shutdown. Throttling
		* happens when temperature <= threshold. If not available, set to NAN.
		* Unit is same as Temperature's value.
		* The number of theresholds must be the same as ThrottlingSeverity#len.
		* The array size must be the same as ThrottlingSeverity's enum cardinality.
		*/
		float[] coldThrottlingThresholds;
		}