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

Commit 54fed512 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

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

parents faa14b94 427c605b

include/cutils/ashmem.h

+4 −16
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 


#include <stddef.h>



#if defined(__BIONIC__)

#include <linux/ashmem.h>

#endif



#ifdef __cplusplus

extern "C" {

#endif
@@ -26,20 +30,4 @@ int ashmem_get_size_region(int fd); 
}

#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 */

libcutils/ashmem-host.c

+2 −2
Original line number Diff line number Diff line
@@ -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)