commit 0cb1c4924379a0cc5da8668743ff6b09d2e1cc1d
author Peng Xu <pengxu@google.com> Thu Aug 03 00:05:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 00:05:08 2017 +0000
tree 3538bb5ab0377e80cae1edd86c933aa1c6d6b984
parent f681bb656e8ddb3a1eda4546e9f65125b1dafab8
parent 18510e1f6fcb53f8f36d1b53c77443d8bd2e3ae6

Merge "Add android version guard to ASensorManager_getInstanceForPackage"
am: 18510e1f6f

Change-Id: Ic96f8b7a3c6611f39303294405dd6d6d1ddac63f

include/android/sensor.h

diff --git a/include/android/sensor.h b/include/android/sensor.h
index 97b4a2a..7f46087 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -381,8 +381,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.
@@ -393,6 +398,7 @@
  *
  */
 ASensorManager* ASensorManager_getInstanceForPackage(const char* packageName);
+#endif
 
 /**
  * Returns the list of available sensors.