ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Don't expose ashmem constants on the host."

Browse source
This commit is contained in:
Elliott Hughes 2016-05-16 17:23:51 +00:00 • committed by Gerrit Code Review
commit 54fed512b9
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/cutils/ashmem.h
View file

@ -12,6 +12,10 @@
#include <stddef.h> #include <stddef.h>
#if defined(__BIONIC__)
#include <linux/ashmem.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -26,20 +30,4 @@ int ashmem_get_size_region(int fd);
} }
#endif #endif
#ifndef __ASHMEMIOC /* in case someone included <linux/ashmem.h> too */
#define ASHMEM_NAME_LEN 256
#define ASHMEM_NAME_DEF "dev/ashmem"
/* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */
#define ASHMEM_NOT_PURGED 0
#define ASHMEM_WAS_PURGED 1
/* Return values from ASHMEM_UNPIN: Is the mapping now pinned or unpinned? */
#define ASHMEM_IS_UNPINNED 0
#define ASHMEM_IS_PINNED 1
#endif /* ! __ASHMEMIOC */
#endif /* _CUTILS_ASHMEM_H */ #endif /* _CUTILS_ASHMEM_H */

4
libcutils/ashmem-host.c
View file

@ -62,12 +62,12 @@ int ashmem_set_prot_region(int fd __unused, int prot __unused)
int ashmem_pin_region(int fd __unused, size_t offset __unused, size_t len __unused) int ashmem_pin_region(int fd __unused, size_t offset __unused, size_t len __unused)
{ {
return ASHMEM_NOT_PURGED; return 0 /*ASHMEM_NOT_PURGED*/;
} }
int ashmem_unpin_region(int fd __unused, size_t offset __unused, size_t len __unused) int ashmem_unpin_region(int fd __unused, size_t offset __unused, size_t len __unused)
{ {
return ASHMEM_IS_UNPINNED; return 0 /*ASHMEM_IS_UNPINNED*/;
} }
int ashmem_get_size_region(int fd) int ashmem_get_size_region(int fd)