diff options
| author | 2018-07-31 14:50:10 -0700 | |
|---|---|---|
| committer | 2018-07-31 14:50:10 -0700 | |
| commit | f58f56d19128e877c53af771d3ca50acf8b652ed (patch) | |
| tree | a9732098b3f5d44433ae5a63b81fb681e888305d | |
| parent | 81ee4fc47585fc6721dc26fc258c22aa3a91f926 (diff) | |
| parent | 036335d2764d77a1c0001830b81631ed084aef4e (diff) | |
Merge "Fix ASharedMemory doxygen formatting, add availability." am: 519485d161
am: 036335d276
Change-Id: Ieb3b9f3b543bf8d93fa616b98adb04a29ddbc768
| -rw-r--r-- | include/android/sharedmem.h | 11 | ||||
| -rw-r--r-- | include/android/sharedmem_jni.h | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/android/sharedmem.h b/include/android/sharedmem.h index 0354f17f48..5a4f6953a3 100644 --- a/include/android/sharedmem.h +++ b/include/android/sharedmem.h @@ -21,6 +21,7 @@ /** * @file sharedmem.h + * @brief Shared memory buffers that can be shared across process. */ #ifndef ANDROID_SHARED_MEMORY_H @@ -44,10 +45,6 @@ * - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES */ -/** - * Structures and functions for a shared memory buffer that can be shared across process. - */ - #ifdef __cplusplus extern "C" { #endif @@ -61,6 +58,8 @@ extern "C" { * * Use close() to release the shared memory region. * + * Available since API level 26. + * * \param name an optional name. * \param size size of the shared memory region * \return file descriptor that denotes the shared memory; error code on failure. @@ -70,6 +69,8 @@ int ASharedMemory_create(const char *name, size_t size) __INTRODUCED_IN(26); /** * Get the size of the shared memory region. * + * Available since API level 26. + * * \param fd file descriptor of the shared memory region * \return size in bytes; 0 if fd is not a valid shared memory file descriptor. */ @@ -99,6 +100,8 @@ size_t ASharedMemory_getSize(int fd) __INTRODUCED_IN(26); * * // share fd with another process here and the other process can only map with PROT_READ. * + * Available since API level 26. + * * \param fd file descriptor of the shared memory region. * \param prot any bitwise-or'ed combination of PROT_READ, PROT_WRITE, PROT_EXEC denoting * updated access. Note access can only be removed, but not added back. diff --git a/include/android/sharedmem_jni.h b/include/android/sharedmem_jni.h index d8b514f680..5abc245083 100644 --- a/include/android/sharedmem_jni.h +++ b/include/android/sharedmem_jni.h @@ -21,6 +21,7 @@ /** * @file sharedmem_jni.h + * @brief Shared memory buffers that can be shared across process. */ #ifndef ANDROID_SHARED_MEMORY_JNI_H @@ -46,10 +47,6 @@ * - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES */ -/** - * Structures and functions for a shared memory buffer that can be shared across process. - */ - #ifdef __cplusplus extern "C" { #endif @@ -62,6 +59,8 @@ extern "C" { * * Use close() to release the shared memory region. * + * Available since API level 27. + * * \param env The JNIEnv* pointer * \param sharedMemory The Java android.os.SharedMemory object * \return file descriptor that denotes the shared memory; -1 if the shared memory object is |