Fix __ANDROID_API__ guards for libnativewindow
Partial revert of:
- "Add __INTRODUCED_IN to <android/native_window.h>."
commit a2c9607eab7214db97e4a63fb18154d4dfd95284.
- "Add __INTRODUCED_IN annotations to <android/hardware_buffer.h>."
commit 493f4a23bf586bf1bcd5e9bc73ed3c94852fc199
Most of these APIs were available via libandroid.so in API 9.
Bug: http://b/111668906
Bug: http://b/111660252
Test: m
Change-Id: I40874c4cd3413abf26f74f21caa5fb845fab721b
Merged-In: I40874c4cd3413abf26f74f21caa5fb845fab721b
(cherry picked from commit 733e443cc01c3a3d5bf756976c1a4599c236e1ef)
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
};