commit 1dc1edfd47ce2ff8d69d9720166e9dfec3f614a4
author Isaac Manjarres <isaacmanjarres@google.com> Tue Mar 04 11:38:50 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 04 11:38:50 2025 -0800
tree 63f2866c13a346fcade1b401102009bb25312407
parent 4cd076ad1fa872740cdfddedc25bfaac99ff6464
parent 6d4e75a593f594268535b964c732f9c4c51d3612

Merge "ashmem: Remove backwards compatibility for R APEXes running on Q" into main

libcutils/ashmem-dev.cpp

diff --git a/libcutils/ashmem-dev.cpp b/libcutils/ashmem-dev.cpp
index b4f1d7f..cfc2d3a 100644
--- a/libcutils/ashmem-dev.cpp
+++ b/libcutils/ashmem-dev.cpp
@@ -182,19 +182,9 @@
     }
 
     android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(ashmem_device_path.c_str(), O_RDWR | O_CLOEXEC)));
-    int errno1 = errno;
-    // fallback for APEX w/ use_vendor on Q, which would have still used /dev/ashmem
-    // TODO: remove this?
     if (!fd.ok()) {
-        fd.reset(TEMP_FAILURE_RETRY(open("/dev/ashmem", O_RDWR | O_CLOEXEC)));
-        int errno2 = errno;
-        if (!fd.ok()) {
-            /* Q launching devices and newer must not reach here since they should have been
-             * able to open ashmem_device_path */
-            ALOGE("Unable to open ashmem device %s (%s) and /dev/ashmem (%s)",
-                  ashmem_device_path.c_str(), strerror(errno1), strerror(errno2));
-            return -1;
-        }
+        ALOGE("Unable to open ashmem device: %m");
+        return -1;
     }
 
     struct stat st;