Merge "Address NDK API feedback" into main (8703fd84) · Commits · e / os / android_frameworks_native

include/android/system_health.h

+23 −25

Original line number	Original line	Diff line number	Diff line
	@@ -81,10 +81,10 @@ typedef struct AGpuHeadroomParams AGpuHeadroomParams;
	*		*
	* @return A new instance of ACpuHeadroomParams.		* @return A new instance of ACpuHeadroomParams.
	*/		*/
	ACpuHeadroomParams *_Nonnull ACpuHeadroomParams_create()		ACpuHeadroomParams* _Nonnull ACpuHeadroomParams_create(void)
	__INTRODUCED_IN(36);		__INTRODUCED_IN(36);

	enum ACpuHeadroomCalculationType {		typedef enum ACpuHeadroomCalculationType : int32_t {
	/**		/**
	* Use the minimum headroom value within the calculation window.		* Use the minimum headroom value within the calculation window.
	* Introduced in API level 36.		* Introduced in API level 36.
	@@ -95,10 +95,9 @@ enum ACpuHeadroomCalculationType {
	* Introduced in API level 36.		* Introduced in API level 36.
	*/		*/
	ACPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1,		ACPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1,
	};		} ACpuHeadroomCalculationType;
	typedef enum ACpuHeadroomCalculationType ACpuHeadroomCalculationType;

	enum AGpuHeadroomCalculationType {		typedef enum AGpuHeadroomCalculationType : int32_t {
	/**		/**
	* Use the minimum headroom value within the calculation window.		* Use the minimum headroom value within the calculation window.
	* Introduced in API level 36.		* Introduced in API level 36.
	@@ -109,8 +108,7 @@ enum AGpuHeadroomCalculationType {
	* Introduced in API level 36.		* Introduced in API level 36.
	*/		*/
	AGPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1,		AGPU_HEADROOM_CALCULATION_TYPE_AVERAGE = 1,
	};		} AGpuHeadroomCalculationType;
	typedef enum AGpuHeadroomCalculationType AGpuHeadroomCalculationType;

	/**		/**
	* Sets the headroom calculation window size in ACpuHeadroomParams.		* Sets the headroom calculation window size in ACpuHeadroomParams.
	@@ -238,7 +236,7 @@ __INTRODUCED_IN(36);
	*		*
	* @return A new instance of AGpuHeadroomParams.		* @return A new instance of AGpuHeadroomParams.
	*/		*/
	AGpuHeadroomParams *_Nonnull AGpuHeadroomParams_create()		AGpuHeadroomParams* _Nonnull AGpuHeadroomParams_create(void)
	__INTRODUCED_IN(36);		__INTRODUCED_IN(36);

	/**		/**