Merge "Add android version guard to ASensorManager_getInstanceForPackage"

am: 18510e1f6f

Change-Id: Ic96f8b7a3c6611f39303294405dd6d6d1ddac63f

1 files changed, 6 insertions, 0 deletions

diff --git a/include/android/sensor.h b/include/android/sensor.h
index 97b4a2ae60..7f460873b5 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -381,8 +381,13 @@ typedef ASensorRef const* ASensorList;
  *     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 @@ __attribute__ ((deprecated)) ASensorManager* ASensorManager_getInstance();
  *
  */
 ASensorManager* ASensorManager_getInstanceForPackage(const char* packageName);
+#endif
 
 /**
  * Returns the list of available sensors.