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

Commit 4adf420e authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Add __INTRODUCED_IN annotations to <android/hardware_buffer.h>." am:... 

Merge "Add __INTRODUCED_IN annotations to <android/hardware_buffer.h>." am: 28046cb2 am: 64ceec18
am: d8712d44

Change-Id: I7ada99e357a963b053821cd492b78a196a8af5b4
parents 5d51a061 d8712d44

libs/nativewindow/include/android/hardware_buffer.h

+8 −8
Original line number Diff line number Diff line
@@ -223,25 +223,25 @@ typedef struct AHardwareBuffer AHardwareBuffer; 
 * any reason. The returned buffer has a reference count of 1.

 */

int AHardwareBuffer_allocate(const AHardwareBuffer_Desc* desc,

        AHardwareBuffer** outBuffer);

        AHardwareBuffer** outBuffer) __INTRODUCED_IN(26);

/**

 * Acquire a reference on the given AHardwareBuffer object.  This prevents the

 * object from being deleted until the last reference is removed.

 */

void AHardwareBuffer_acquire(AHardwareBuffer* buffer);

void AHardwareBuffer_acquire(AHardwareBuffer* buffer) __INTRODUCED_IN(26);



/**

 * Remove a reference that was previously acquired with

 * AHardwareBuffer_acquire().

 */

void AHardwareBuffer_release(AHardwareBuffer* buffer);

void AHardwareBuffer_release(AHardwareBuffer* buffer) __INTRODUCED_IN(26);



/**

 * Return a description of the AHardwareBuffer in the passed

 * AHardwareBuffer_Desc struct.

 */

void AHardwareBuffer_describe(const AHardwareBuffer* buffer,

        AHardwareBuffer_Desc* outDesc);

        AHardwareBuffer_Desc* outDesc) __INTRODUCED_IN(26);



/**

 * Lock the AHardwareBuffer for reading or writing, depending on the usage flags
@@ -277,7 +277,7 @@ void AHardwareBuffer_describe(const AHardwareBuffer* buffer, 
 * number of the lock fails for any reason.

 */

int AHardwareBuffer_lock(AHardwareBuffer* buffer, uint64_t usage,

        int32_t fence, const ARect* rect, void** outVirtualAddress);

        int32_t fence, const ARect* rect, void** outVirtualAddress) __INTRODUCED_IN(26);



/**

 * Unlock the AHardwareBuffer; must be called after all changes to the buffer
@@ -289,7 +289,7 @@ int AHardwareBuffer_lock(AHardwareBuffer* buffer, uint64_t usage, 
 * \return 0 on success, -EINVAL if \a buffer is NULL, or an error

 * number if the unlock fails for any reason.

 */

int AHardwareBuffer_unlock(AHardwareBuffer* buffer, int32_t* fence);

int AHardwareBuffer_unlock(AHardwareBuffer* buffer, int32_t* fence) __INTRODUCED_IN(26);



/**

 * Send the AHardwareBuffer to an AF_UNIX socket.
@@ -297,7 +297,7 @@ int AHardwareBuffer_unlock(AHardwareBuffer* buffer, int32_t* fence); 
 * \return 0 on success, -EINVAL if \a buffer is NULL, or an error

 * number if the operation fails for any reason.

 */

int AHardwareBuffer_sendHandleToUnixSocket(const AHardwareBuffer* buffer, int socketFd);

int AHardwareBuffer_sendHandleToUnixSocket(const AHardwareBuffer* buffer, int socketFd) __INTRODUCED_IN(26);



/**

 * Receive the AHardwareBuffer from an AF_UNIX socket.
@@ -305,7 +305,7 @@ int AHardwareBuffer_sendHandleToUnixSocket(const AHardwareBuffer* buffer, int so 
 * \return 0 on success, -EINVAL if \a outBuffer is NULL, or an error

 * number if the operation fails for any reason.

 */

int AHardwareBuffer_recvHandleFromUnixSocket(int socketFd, AHardwareBuffer** outBuffer);

int AHardwareBuffer_recvHandleFromUnixSocket(int socketFd, AHardwareBuffer** outBuffer) __INTRODUCED_IN(26);



__END_DECLS