commit 2cbd0a57ad2bb910fbf1e5809b3df9cc8f5bc6c3
author Steven Moreland <smoreland@google.com> Wed Jan 15 11:51:00 2020 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 15 11:51:00 2020 -0800
tree b8ac39e6210cf67d14158ce692b366f56c86ee56
parent e000b07a3d47b574acd9ec1988e71b76fd4db295
parent b0546b3968757c37af300f785dc3b7d644d461e8

Merge "libcutils: fallback to /dev/ashmem"
am: 6e016ef80e

Change-Id: Ie8fcbadf4841a0b8537657598cd5dc1a01742f67

libcutils/ashmem-dev.cpp

diff --git a/libcutils/ashmem-dev.cpp b/libcutils/ashmem-dev.cpp
index 340572c..8c232f0 100644
--- a/libcutils/ashmem-dev.cpp
+++ b/libcutils/ashmem-dev.cpp
@@ -203,19 +203,23 @@
 {
     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);