Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 399127ef authored by Peng Xu's avatar Peng Xu Committed by android-build-merger
Browse files

Merge "Add android version guard to ASensorManager_getInstanceForPackage" am:... 

Merge "Add android version guard to ASensorManager_getInstanceForPackage" am: 18510e1f am: 0cb1c492
am: 20af7560

Change-Id: Iffe5c969cff323a35769ea459978c2ec3dae8e45
parents 9393de42 20af7560

include/android/sensor.h

+6 −0
Original line number Diff line number Diff line
@@ -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.