Merge "Remove __ANDROID_API__ guards from thermal.h" (70e4f265) · Commits · e / os / platform_frameworks_native

include/android/thermal.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -109,8 +109,6 @@ typedef struct AThermalManager AThermalManager;
		*/
		typedef void (AThermal_StatusCallback)(void data, AThermalStatus status);

		#if __ANDROID_API__ >= 30

		/**
		* Acquire an instance of the thermal manager. This must be freed using
		* {@link AThermal_releaseManager}.
		@@ -179,10 +177,6 @@ int AThermal_registerThermalStatusListener(AThermalManager *manager,
		int AThermal_unregisterThermalStatusListener(AThermalManager *manager,
		AThermal_StatusCallback callback, void *data) __INTRODUCED_IN(30);

		#endif // __ANDROID_API__ >= 30

		#if __ANDROID_API__ >= 31

		/**
		* Provides an estimate of how much thermal headroom the device currently has before
		* hitting severe throttling.
		@@ -224,8 +218,6 @@ int AThermal_unregisterThermalStatusListener(AThermalManager *manager,
		float AThermal_getThermalHeadroom(AThermalManager *manager,
		int forecastSeconds) __INTRODUCED_IN(31);

		#endif // __ANDROID_API__ >= 31

		#ifdef __cplusplus
		}
		#endif