Merge "Add android version guard to ASensorManager_getInstanceForPackage" (18510e1f) · Commits · e / os / platform_frameworks_native

include/android/sensor.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -344,8 +344,13 @@ typedef ASensorRef const* ASensorList;
	* ASensorManager* sensorManager = ASensorManager_getInstance();		* ASensorManager* sensorManager = ASensorManager_getInstance();
	*		*
	*/		*/
			#if __ANDROID_API__ >= __ANDROID_API_O__
	__attribute__ ((deprecated)) ASensorManager* ASensorManager_getInstance();		__attribute__ ((deprecated)) ASensorManager* ASensorManager_getInstance();
			#else
			ASensorManager* ASensorManager_getInstance();
			#endif

			#if __ANDROID_API__ >= __ANDROID_API_O__
	/*		/*
	* Get a reference to the sensor manager. ASensorManager is a singleton		* Get a reference to the sensor manager. ASensorManager is a singleton
	* per package as different packages may have access to different sensors.		* per package as different packages may have access to different sensors.
	@@ -356,6 +361,7 @@ __attribute__ ((deprecated)) ASensorManager* ASensorManager_getInstance();
	*		*
	*/		*/
	ASensorManager* ASensorManager_getInstanceForPackage(const char* packageName);		ASensorManager* ASensorManager_getInstanceForPackage(const char* packageName);
			#endif

	/**		/**
	* Returns the list of available sensors.		* Returns the list of available sensors.