Merge changes from topic 'libcutils_private_headers'
* changes:
Use getpwnam()/getgrnam() instead of AID_* macros (libgui)
Use cutils/android_filesystem_config.h
diff --git a/include/android/sensor.h b/include/android/sensor.h
index 6c12972..6402389 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -344,8 +344,13 @@
* ASensorManager* sensorManager = ASensorManager_getInstance();
*
*/
+#if __ANDROID_API__ >= __ANDROID_API_O__
__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
* per package as different packages may have access to different sensors.
@@ -356,6 +361,7 @@
*
*/
ASensorManager* ASensorManager_getInstanceForPackage(const char* packageName);
+#endif
/**
* Returns the list of available sensors.