diff options
| author | Paul Lawrence <paullawrence@google.com> | 2023-07-17 16:52:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-17 16:52:01 +0000 |
| commit | 30537bd10a17d48a52506d1bb679b578e969d33f (patch) | |
| tree | 7f0387af5681fb69ea2ba014bc07e3ec08179070 | |
| parent | af594059f43953388c5e2c9c8058f813e1815532 (diff) | |
| parent | 78973da8efdb5b82f9833cf9a25ed89a752e1033 (diff) | |
| download | bionic-30537bd10a17d48a52506d1bb679b578e969d33f.tar.gz | |
Revert "Use proprety_socket_for_system if permissions allow" am: 78973da8ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028889
Change-Id: I22c2938e37cde28b57676e7234d4bd1cc4b49865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libc/bionic/system_property_set.cpp | 9 | ||||
| -rw-r--r-- | libc/include/sys/_system_properties.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/libc/bionic/system_property_set.cpp b/libc/bionic/system_property_set.cpp index bde0c1002..212aafcc1 100644 --- a/libc/bionic/system_property_set.cpp +++ b/libc/bionic/system_property_set.cpp @@ -49,8 +49,6 @@ #include "private/ScopedFd.h" static const char property_service_socket[] = "/dev/socket/" PROP_SERVICE_NAME; -static const char property_service_for_system_socket[] = - "/dev/socket/" PROP_SERVICE_FOR_SYSTEM_NAME; static const char* kServiceVersionPropertyName = "ro.property_service.version"; class PropertyServiceConnection { @@ -62,13 +60,10 @@ class PropertyServiceConnection { return; } - const char* socket = access(property_service_for_system_socket, W_OK) == 0 - ? property_service_for_system_socket - : property_service_socket; - const size_t namelen = strlen(socket); + const size_t namelen = strlen(property_service_socket); sockaddr_un addr; memset(&addr, 0, sizeof(addr)); - strlcpy(addr.sun_path, socket, sizeof(addr.sun_path)); + strlcpy(addr.sun_path, property_service_socket, sizeof(addr.sun_path)); addr.sun_family = AF_LOCAL; socklen_t alen = namelen + offsetof(sockaddr_un, sun_path) + 1; diff --git a/libc/include/sys/_system_properties.h b/libc/include/sys/_system_properties.h index c7a30ebbd..744a45b71 100644 --- a/libc/include/sys/_system_properties.h +++ b/libc/include/sys/_system_properties.h @@ -41,7 +41,6 @@ __BEGIN_DECLS #define PROP_SERVICE_NAME "property_service" -#define PROP_SERVICE_FOR_SYSTEM_NAME "property_service_for_system" #define PROP_FILENAME "/dev/__properties__" #define PROP_MSG_SETPROP 1 |