diff options
| author | Elliott Hughes <enh@google.com> | 2016-05-16 17:34:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-16 17:34:13 +0000 |
| commit | cb4abee6caecdc42c6bcc2f48e824c4708df0874 (patch) | |
| tree | 98c6f50bbea2a5bd499d89b1e73315066244ce0d /libcutils | |
| parent | 2a9a993af99585af0bce6eca6d92c86370977a27 (diff) | |
| parent | ed95190b690adf3a452001fc527881af913c5ccd (diff) | |
| download | core-cb4abee6caecdc42c6bcc2f48e824c4708df0874.tar.gz core-cb4abee6caecdc42c6bcc2f48e824c4708df0874.tar.bz2 core-cb4abee6caecdc42c6bcc2f48e824c4708df0874.zip | |
Merge "Don\'t expose ashmem constants on the host." am: 54fed512b9
am: ed95190b69
* commit 'ed95190b690adf3a452001fc527881af913c5ccd':
Don't expose ashmem constants on the host.
Change-Id: I930dd0b72e88647b1e94694e5fb183431c7d75c6
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/ashmem-host.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcutils/ashmem-host.c b/libcutils/ashmem-host.c index c85f06b00..1f9f753e4 100644 --- a/libcutils/ashmem-host.c +++ b/libcutils/ashmem-host.c @@ -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) { - return ASHMEM_NOT_PURGED; + return 0 /*ASHMEM_NOT_PURGED*/; } 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) |