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

Merge "libcutils: fallback to /dev/ashmem"

Browse source
This commit is contained in:
Treehugger Robot 2020-01-15 19:48:26 +00:00 • committed by Gerrit Code Review
commit 6e016ef80e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libcutils/ashmem-dev.cpp
View file

@ -203,19 +203,23 @@ static int __ashmem_open_locked()
{ {
static const std::string ashmem_device_path = get_ashmem_device_path(); static const std::string ashmem_device_path = get_ashmem_device_path();
int ret;
struct stat st;
if (ashmem_device_path.empty()) { if (ashmem_device_path.empty()) {
return -1; return -1;
} }
int fd = TEMP_FAILURE_RETRY(open(ashmem_device_path.c_str(), O_RDWR | O_CLOEXEC)); int fd = TEMP_FAILURE_RETRY(open(ashmem_device_path.c_str(), O_RDWR | O_CLOEXEC));
// fallback for APEX w/ use_vendor on Q, which would have still used /dev/ashmem
if (fd < 0) {
fd = TEMP_FAILURE_RETRY(open("/dev/ashmem", O_RDWR | O_CLOEXEC));
}
if (fd < 0) { if (fd < 0) {
return fd; return fd;
} }
ret = TEMP_FAILURE_RETRY(fstat(fd, &st)); struct stat st;
int ret = TEMP_FAILURE_RETRY(fstat(fd, &st));
if (ret < 0) { if (ret < 0) {
int save_errno = errno; int save_errno = errno;
close(fd); close(fd);