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

Commit 349d1dd7 authored by Valerie Hau's avatar Valerie Hau
Browse files

Moving lockAndGetInfo to only load on version 29 

Bug: 123423521
Test: build, boot, android.hardware.nativehardware.cts.AHardwareBufferNativeTests
Change-Id: I009636474fad63c6da92c0724a0e645a814af6a2
parent d2f4dafa

libs/nativewindow/include/android/hardware_buffer.h

+12 −12
Original line number Diff line number Diff line
@@ -421,18 +421,6 @@ void AHardwareBuffer_describe(const AHardwareBuffer* buffer, 
int AHardwareBuffer_lock(AHardwareBuffer* buffer, uint64_t usage,

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



/**

 * Lock an AHardwareBuffer for direct CPU access.

 *

 * This function is the same as the above lock function, but passes back

 * additional information about the bytes per pixel and the bytes per stride

 * of the locked buffer.  If the bytes per pixel or bytes per stride are unknown

 * or variable, or if the underlying mapper implementation does not support returning

 * additional information, then this call will fail with INVALID_OPERATION

 */

int AHardwareBuffer_lockAndGetInfo(AHardwareBuffer* buffer, uint64_t usage,

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

        int32_t* outBytesPerPixel, int32_t* outBytesPerStride) __INTRODUCED_IN(29);

/**

 * Lock a potentially multi-planar AHardwareBuffer for direct CPU access.

 *
@@ -518,6 +506,18 @@ int AHardwareBuffer_recvHandleFromUnixSocket(int socketFd, AHardwareBuffer** out 
 */

int AHardwareBuffer_isSupported(const AHardwareBuffer_Desc* desc) __INTRODUCED_IN(29);



/**

 * Lock an AHardwareBuffer for direct CPU access.

 *

 * This function is the same as the above lock function, but passes back

 * additional information about the bytes per pixel and the bytes per stride

 * of the locked buffer.  If the bytes per pixel or bytes per stride are unknown

 * or variable, or if the underlying mapper implementation does not support returning

 * additional information, then this call will fail with INVALID_OPERATION

 */

int AHardwareBuffer_lockAndGetInfo(AHardwareBuffer* buffer, uint64_t usage,

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

        int32_t* outBytesPerPixel, int32_t* outBytesPerStride) __INTRODUCED_IN(29);

#endif // __ANDROID_API__ >= 29



__END_DECLS