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

Commit 0714a9ea authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libcutils: fallback to /dev/ashmem"

am: 6e016ef8

Change-Id: Ie8fcbadf4841a0b8537657598cd5dc1a01742f67
parents 3fabcf5f 6e016ef8
Loading
Loading
Loading
Loading
+8 −4
Original line number Diff line number Diff line
@@ -203,19 +203,23 @@ static int __ashmem_open_locked()
{
    static const std::string ashmem_device_path = get_ashmem_device_path();

    int ret;
    struct stat st;

    if (ashmem_device_path.empty()) {
        return -1;
    }

    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) {
        return fd;
    }

    ret = TEMP_FAILURE_RETRY(fstat(fd, &st));
    struct stat st;
    int ret = TEMP_FAILURE_RETRY(fstat(fd, &st));
    if (ret < 0) {
        int save_errno = errno;
        close(fd);