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

Commit dbc55592 authored by Lee Shombert's avatar Lee Shombert Committed by Automerger Merge Worker
Browse files

Merge "Increase sysprop timeout" into main am: facf8f89 am: e54d27a8 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3435382



Change-Id: I4af2fee774ee14f2fd61043488d9d6a02366b900
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcd24ab3 e54d27a8

init/property_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ uint32_t HandlePropertySetNoSocket(const std::string& name, const std::string& v 
}



static void handle_property_set_fd(int fd) {

    static constexpr uint32_t kDefaultSocketTimeout = 2000; /* ms */

    static constexpr uint32_t kDefaultSocketTimeout = 5000; /* ms */



    int s = accept4(fd, nullptr, nullptr, SOCK_CLOEXEC);

    if (s == -1) {