Merge "[automerger skipped] DO NOT MERGE: Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: f2e1dc6c33 -s ours am: 10965f3062 -s ours"
diff --git a/include/android/choreographer.h b/include/android/choreographer.h
index 11f8f6b..d75de1e 100644
--- a/include/android/choreographer.h
+++ b/include/android/choreographer.h
@@ -43,6 +43,8 @@
*/
typedef void (*AChoreographer_frameCallback)(long frameTimeNanos, void* data);
+#if __ANDROID_API__ >= 24
+
/**
* Get the AChoreographer instance for the current thread. This must be called
* on an ALooper thread.
@@ -65,6 +67,8 @@
AChoreographer_frameCallback callback, void* data,
long delayMillis) __INTRODUCED_IN(24);
+#endif /* __ANDROID_API__ >= 24 */
+
__END_DECLS
#endif // ANDROID_CHOREOGRAPHER_H
diff --git a/include/android/configuration.h b/include/android/configuration.h
index 81aedca..ef6c5a2 100644
--- a/include/android/configuration.h
+++ b/include/android/configuration.h
@@ -675,6 +675,7 @@
*/
void AConfiguration_setUiModeNight(AConfiguration* config, int32_t uiModeNight);
+#if __ANDROID_API__ >= 13
/**
* Return the current configuration screen width in dp units, or
* ACONFIGURATION_SCREEN_WIDTH_DP_ANY if not set.
@@ -707,7 +708,9 @@
* Set the configuration's smallest screen width in dp units.
*/
void AConfiguration_setSmallestScreenWidthDp(AConfiguration* config, int32_t value) __INTRODUCED_IN(13);
+#endif /* __ANDROID_API__ >= 13 */
+#if __ANDROID_API__ >= 17
/**
* Return the configuration's layout direction, or
* ACONFIGURATION_LAYOUTDIR_ANY if not set.
@@ -718,6 +721,7 @@
* Set the configuration's layout direction.
*/
void AConfiguration_setLayoutDirection(AConfiguration* config, int32_t value) __INTRODUCED_IN(17);
+#endif /* __ANDROID_API__ >= 17 */
/**
* Perform a diff between two configurations. Returns a bit mask of
diff --git a/include/android/input.h b/include/android/input.h
index 3b36d2e..cfade6c 100644
--- a/include/android/input.h
+++ b/include/android/input.h
@@ -986,8 +986,10 @@
*/
int32_t AMotionEvent_getMetaState(const AInputEvent* motion_event);
+#if __ANDROID_API__ >= 14
/** Get the button state of all buttons that are pressed. */
int32_t AMotionEvent_getButtonState(const AInputEvent* motion_event) __INTRODUCED_IN(14);
+#endif
/**
* Get a bitfield indicating which edges, if any, were touched by this motion event.
@@ -1052,12 +1054,14 @@
*/
int32_t AMotionEvent_getPointerId(const AInputEvent* motion_event, size_t pointer_index);
+#if __ANDROID_API__ >= 14
/**
* Get the tool type of a pointer for the given pointer index.
* The tool type indicates the type of tool used to make contact such as a
* finger or stylus, if known.
*/
int32_t AMotionEvent_getToolType(const AInputEvent* motion_event, size_t pointer_index) __INTRODUCED_IN(14);
+#endif
/**
* Get the original raw X coordinate of this event.
@@ -1147,9 +1151,11 @@
*/
float AMotionEvent_getOrientation(const AInputEvent* motion_event, size_t pointer_index);
+#if __ANDROID_API__ >= 13
/** Get the value of the request axis for the given pointer index. */
float AMotionEvent_getAxisValue(const AInputEvent* motion_event,
int32_t axis, size_t pointer_index) __INTRODUCED_IN(13);
+#endif
/**
* Get the number of historical points in this event. These are movements that
@@ -1280,12 +1286,14 @@
float AMotionEvent_getHistoricalOrientation(const AInputEvent* motion_event, size_t pointer_index,
size_t history_index);
+#if __ANDROID_API__ >= 13
/**
* Get the historical value of the request axis for the given pointer index
* that occurred between this event and the previous motion event.
*/
float AMotionEvent_getHistoricalAxisValue(const AInputEvent* motion_event,
int32_t axis, size_t pointer_index, size_t history_index) __INTRODUCED_IN(13);
+#endif
struct AInputQueue;
diff --git a/include/android/multinetwork.h b/include/android/multinetwork.h
index 55df9f8..4d24680 100644
--- a/include/android/multinetwork.h
+++ b/include/android/multinetwork.h
@@ -60,6 +60,8 @@
* on failure with an appropriate errno value set.
*/
+#if __ANDROID_API__ >= 23
+
/**
* Set the network to be used by the given socket file descriptor.
*
@@ -106,6 +108,8 @@
const char *node, const char *service,
const struct addrinfo *hints, struct addrinfo **res) __INTRODUCED_IN(23);
+#endif /* __ANDROID_API__ >= 23 */
+
__END_DECLS
#endif // ANDROID_MULTINETWORK_H
diff --git a/include/android/native_window_jni.h b/include/android/native_window_jni.h
index 74e43c7..0c196b9 100644
--- a/include/android/native_window_jni.h
+++ b/include/android/native_window_jni.h
@@ -44,6 +44,7 @@
*/
ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface);
+#if __ANDROID_API__ >= 26
/**
* Return a Java Surface object derived from the ANativeWindow, for interacting
* with it through Java code. The returned Java object acquires a reference on
@@ -52,6 +53,7 @@
* collected.
*/
jobject ANativeWindow_toSurface(JNIEnv* env, ANativeWindow* window) __INTRODUCED_IN(26);
+#endif
#ifdef __cplusplus
};
diff --git a/include/android/sensor.h b/include/android/sensor.h
index 59229c1..005564d 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -472,12 +472,13 @@
* ASensorManager* sensorManager = ASensorManager_getInstance();
*
*/
-#if __ANDROID_API__ >= __ANDROID_API_O__
+#if __ANDROID_API__ >= 26
__attribute__ ((deprecated)) ASensorManager* ASensorManager_getInstance();
#else
ASensorManager* ASensorManager_getInstance();
#endif
+#if __ANDROID_API__ >= 26
/**
* Get a reference to the sensor manager. ASensorManager is a singleton
* per package as different packages may have access to different sensors.
@@ -488,6 +489,7 @@
*
*/
ASensorManager* ASensorManager_getInstanceForPackage(const char* packageName) __INTRODUCED_IN(26);
+#endif
/**
* Returns the list of available sensors.
@@ -500,11 +502,13 @@
*/
ASensor const* ASensorManager_getDefaultSensor(ASensorManager* manager, int type);
+#if __ANDROID_API__ >= 21
/**
* Returns the default sensor with the given type and wakeUp properties or NULL if no sensor
* of this type and wakeUp properties exists.
*/
ASensor const* ASensorManager_getDefaultSensorEx(ASensorManager* manager, int type, bool wakeUp) __INTRODUCED_IN(21);
+#endif
/**
* Creates a new sensor event queue and associate it with a looper.
@@ -521,6 +525,7 @@
*/
int ASensorManager_destroyEventQueue(ASensorManager* manager, ASensorEventQueue* queue);
+#if __ANDROID_API__ >= 26
/**
* Create direct channel based on shared memory
*
@@ -609,6 +614,7 @@
*/
int ASensorManager_configureDirectReport(ASensorManager* manager,
ASensor const* sensor, int channelId, int rate) __INTRODUCED_IN(26);
+#endif /* __ANDROID_API__ >= 26 */
/*****************************************************************************/
@@ -727,6 +733,7 @@
*/
int ASensor_getMinDelay(ASensor const* sensor);
+#if __ANDROID_API__ >= 21
/**
* Returns the maximum size of batches for this sensor. Batches will often be
* smaller, as the hardware fifo might be used for other sensors.
@@ -752,7 +759,9 @@
* Returns true if this is a wake up sensor, false otherwise.
*/
bool ASensor_isWakeUpSensor(ASensor const* sensor) __INTRODUCED_IN(21);
+#endif /* __ANDROID_API__ >= 21 */
+#if __ANDROID_API__ >= 26
/**
* Test if sensor supports a certain type of direct channel.
*
@@ -774,6 +783,7 @@
* does not support direct report.
*/
int ASensor_getHighestDirectReportRateLevel(ASensor const* sensor) __INTRODUCED_IN(26);
+#endif /* __ANDROID_API__ >= 26 */
#ifdef __cplusplus
};
diff --git a/include/android/sharedmem.h b/include/android/sharedmem.h
index 0354f17..b772f70 100644
--- a/include/android/sharedmem.h
+++ b/include/android/sharedmem.h
@@ -27,6 +27,7 @@
#define ANDROID_SHARED_MEMORY_H
#include <stddef.h>
+#include <sys/cdefs.h>
/******************************************************************
*
@@ -52,6 +53,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 26
+
/**
* Create a shared memory region.
*
@@ -106,6 +109,8 @@
*/
int ASharedMemory_setProt(int fd, int prot) __INTRODUCED_IN(26);
+#endif // __ANDROID_API__ >= 26
+
#ifdef __cplusplus
};
#endif
diff --git a/include/android/sharedmem_jni.h b/include/android/sharedmem_jni.h
index d8b514f..e42f9a1 100644
--- a/include/android/sharedmem_jni.h
+++ b/include/android/sharedmem_jni.h
@@ -29,6 +29,7 @@
#include <jni.h>
#include <android/sharedmem.h>
#include <stddef.h>
+#include <sys/cdefs.h>
/******************************************************************
*
@@ -54,6 +55,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 27
+
/**
* Returns a dup'd FD from the given Java android.os.SharedMemory object. The returned file
* descriptor has all the same properties & capabilities as the FD returned from
@@ -70,6 +73,8 @@
*/
int ASharedMemory_dupFromJava(JNIEnv* env, jobject sharedMemory) __INTRODUCED_IN(27);
+#endif // __ANDROID_API__ >= 27
+
#ifdef __cplusplus
};
#endif
diff --git a/include/android/surface_texture.h b/include/android/surface_texture.h
index db10a16..a36e982 100644
--- a/include/android/surface_texture.h
+++ b/include/android/surface_texture.h
@@ -43,6 +43,7 @@
*/
#include <stdint.h>
+#include <sys/cdefs.h>
#include <android/native_window.h>
@@ -58,6 +59,8 @@
*/
typedef struct ASurfaceTexture ASurfaceTexture;
+#if __ANDROID_API__ >= 28
+
/**
* Release the reference to the native ASurfaceTexture acquired with
* ASurfaceTexture_fromSurfaceTexture().
@@ -157,6 +160,8 @@
*/
int64_t ASurfaceTexture_getTimestamp(ASurfaceTexture* st) __INTRODUCED_IN(28);
+#endif /* __ANDROID_API__ >= 28 */
+
__END_DECLS
#endif /* ANDROID_NATIVE_SURFACE_TEXTURE_H */
diff --git a/include/android/trace.h b/include/android/trace.h
index 9f59acf..4d57d4f 100644
--- a/include/android/trace.h
+++ b/include/android/trace.h
@@ -37,6 +37,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 23
+
/**
* Returns true if tracing is enabled. Use this signal to avoid expensive computation only necessary
* when tracing is enabled.
@@ -61,6 +63,8 @@
*/
void ATrace_endSection() __INTRODUCED_IN(23);
+#endif /* __ANDROID_API__ >= 23 */
+
#ifdef __cplusplus
};
#endif
diff --git a/libs/nativewindow/include/android/hardware_buffer.h b/libs/nativewindow/include/android/hardware_buffer.h
index 080387b..9ca4941 100644
--- a/libs/nativewindow/include/android/hardware_buffer.h
+++ b/libs/nativewindow/include/android/hardware_buffer.h
@@ -215,6 +215,8 @@
typedef struct AHardwareBuffer AHardwareBuffer;
+#if __ANDROID_API__ >= 26
+
/**
* Allocates a buffer that backs an AHardwareBuffer using the passed
* AHardwareBuffer_Desc.
@@ -307,6 +309,8 @@
*/
int AHardwareBuffer_recvHandleFromUnixSocket(int socketFd, AHardwareBuffer** outBuffer) __INTRODUCED_IN(26);
+#endif // __ANDROID_API__ >= 26
+
__END_DECLS
#endif // ANDROID_HARDWARE_BUFFER_H
diff --git a/libs/nativewindow/include/android/native_window.h b/libs/nativewindow/include/android/native_window.h
index 78d32e4..6831f91 100644
--- a/libs/nativewindow/include/android/native_window.h
+++ b/libs/nativewindow/include/android/native_window.h
@@ -109,33 +109,33 @@
* Acquire a reference on the given {@link ANativeWindow} object. This prevents the object
* from being deleted until the reference is removed.
*/
-void ANativeWindow_acquire(ANativeWindow* window) __INTRODUCED_IN(26);
+void ANativeWindow_acquire(ANativeWindow* window);
/**
* Remove a reference that was previously acquired with {@link ANativeWindow_acquire()}.
*/
-void ANativeWindow_release(ANativeWindow* window) __INTRODUCED_IN(26);
+void ANativeWindow_release(ANativeWindow* window);
/**
* Return the current width in pixels of the window surface.
*
* \return negative value on error.
*/
-int32_t ANativeWindow_getWidth(ANativeWindow* window) __INTRODUCED_IN(26);
+int32_t ANativeWindow_getWidth(ANativeWindow* window);
/**
* Return the current height in pixels of the window surface.
*
* \return a negative value on error.
*/
-int32_t ANativeWindow_getHeight(ANativeWindow* window) __INTRODUCED_IN(26);
+int32_t ANativeWindow_getHeight(ANativeWindow* window);
/**
* Return the current pixel format (AHARDWAREBUFFER_FORMAT_*) of the window surface.
*
* \return a negative value on error.
*/
-int32_t ANativeWindow_getFormat(ANativeWindow* window) __INTRODUCED_IN(26);
+int32_t ANativeWindow_getFormat(ANativeWindow* window);
/**
* Change the format and size of the window buffers.
@@ -155,7 +155,7 @@
* \return 0 for success, or a negative value on error.
*/
int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window,
- int32_t width, int32_t height, int32_t format) __INTRODUCED_IN(26);
+ int32_t width, int32_t height, int32_t format);
/**
* Lock the window's next drawing surface for writing.
@@ -168,7 +168,7 @@
* \return 0 for success, or a negative value on error.
*/
int32_t ANativeWindow_lock(ANativeWindow* window, ANativeWindow_Buffer* outBuffer,
- ARect* inOutDirtyBounds) __INTRODUCED_IN(26);
+ ARect* inOutDirtyBounds);
/**
* Unlock the window's drawing surface after previously locking it,
@@ -176,7 +176,9 @@
*
* \return 0 for success, or a negative value on error.
*/
-int32_t ANativeWindow_unlockAndPost(ANativeWindow* window) __INTRODUCED_IN(26);
+int32_t ANativeWindow_unlockAndPost(ANativeWindow* window);
+
+#if __ANDROID_API__ >= 26
/**
* Set a transform that will be applied to future buffers posted to the window.
@@ -186,7 +188,9 @@
*/
int32_t ANativeWindow_setBuffersTransform(ANativeWindow* window, int32_t transform) __INTRODUCED_IN(26);
-#if __ANDROID_API__ >= __ANDROID_API_P__
+#endif // __ANDROID_API__ >= 26
+
+#if __ANDROID_API__ >= 28
/**
* All buffers queued after this call will be associated with the dataSpace
@@ -202,16 +206,16 @@
* \return 0 for success, -EINVAL if window is invalid or the dataspace is not
* supported.
*/
-int32_t ANativeWindow_setBuffersDataSpace(ANativeWindow* window, int32_t dataSpace);
+int32_t ANativeWindow_setBuffersDataSpace(ANativeWindow* window, int32_t dataSpace) __INTRODUCED_IN(28);
/**
* Get the dataspace of the buffers in window.
* \return the dataspace of buffers in window, ADATASPACE_UNKNOWN is returned if
* dataspace is unknown, or -EINVAL if window is invalid.
*/
-int32_t ANativeWindow_getBuffersDataSpace(ANativeWindow* window);
+int32_t ANativeWindow_getBuffersDataSpace(ANativeWindow* window) __INTRODUCED_IN(28);
-#endif // __ANDROID_API__ >= __ANDROID_API_P__
+#endif // __ANDROID_API__ >= 28
#ifdef __cplusplus
};