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

Commit 15fabed7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: Convert a single-element array into a scalar" am: ab3bc215 am:...

Merge "init: Convert a single-element array into a scalar" am: ab3bc215 am: f75bd0ee am: c22ec872

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



Change-Id: I677e4af8de8b66a28a20c2432e6304d8aeb724ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26f78415 c22ec872
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -320,13 +320,13 @@ class SocketConnection {

  private:
    bool PollIn(uint32_t* timeout_ms) {
        struct pollfd ufds[1];
        ufds[0].fd = socket_;
        ufds[0].events = POLLIN;
        ufds[0].revents = 0;
        struct pollfd ufd = {
                .fd = socket_,
                .events = POLLIN,
        };
        while (*timeout_ms > 0) {
            auto start_time = std::chrono::steady_clock::now();
            int nr = poll(ufds, 1, *timeout_ms);
            int nr = poll(&ufd, 1, *timeout_ms);
            auto now = std::chrono::steady_clock::now();
            auto time_elapsed =
                std::chrono::duration_cast<std::chrono::milliseconds>(now - start_time);