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

Commit fdb9800f authored by Greg Kaiser's avatar Greg Kaiser
Browse files

adb: Fix incorrect logging statement 

We were logging "fd.get()" after we had already done a
"std::move(fd)".  That won't log the value we were hoping for.
We instead cache the file descriptor value in a local int prior
to the move(), and log that.

Test: TreeHugger
Change-Id: I715874ac63329280ffb55881fb2590fb31dc2457
parent 3ea7785e

adb/sockets.cpp

+2 −1
Original line number Diff line number Diff line
@@ -359,8 +359,9 @@ asocket* create_local_service_socket(std::string_view name, atransport* transpor 
        return nullptr;

    }



    int fd_value = fd.get();

    asocket* s = create_local_socket(std::move(fd));

    LOG(VERBOSE) << "LS(" << s->id << "): bound to '" << name << "' via " << fd.get();

    LOG(VERBOSE) << "LS(" << s->id << "): bound to '" << name << "' via " << fd_value;



#if !ADB_HOST

    if ((name.starts_with("root:") && getuid() != 0 && __android_log_is_debuggable()) ||