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

Commit 09b02ac4 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Print string version of status when errors occur 

To make it easier to debug, let's switch to string versions of status.
That way, we can easier identify the code that is in front of us.

Bug: 185231584
Test: adb shell monkey 10000
Change-Id: If3f5e27866b23500a791fce57e8da02a1c2f54d0
parent 39fa2dfa

libs/input/InputTransport.cpp

+2 −1
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ status_t InputChannel::openInputChannelPair(const std::string& name, 
    int sockets[2];

    if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sockets)) {

        status_t result = -errno;

        ALOGE("channel '%s' ~ Could not create socket pair.  errno=%d", name.c_str(), errno);

        ALOGE("channel '%s' ~ Could not create socket pair.  errno=%s(%d)", name.c_str(),

              strerror(errno), errno);

        outServerChannel.reset();

        outClientChannel.reset();

        return result;

services/inputflinger/dispatcher/InputDispatcher.cpp

+9 −6
Original line number Diff line number Diff line
@@ -3157,8 +3157,9 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime, 
                    ALOGE("channel '%s' ~ Could not publish event because the pipe is full. "

                          "This is unexpected because the wait queue is empty, so the pipe "

                          "should be empty and we shouldn't have any problems writing an "

                          "event to it, status=%d",

                          connection->getInputChannelName().c_str(), status);

                          "event to it, status=%s(%d)",

                          connection->getInputChannelName().c_str(), statusToString(status).c_str(),

                          status);

                    abortBrokenDispatchCycleLocked(currentTime, connection, true /*notify*/);

                } else {

                    // Pipe is full and we are waiting for the app to finish process some events
@@ -3171,8 +3172,9 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime, 
                }

            } else {

                ALOGE("channel '%s' ~ Could not publish event due to an unexpected error, "

                      "status=%d",

                      connection->getInputChannelName().c_str(), status);

                      "status=%s(%d)",

                      connection->getInputChannelName().c_str(), statusToString(status).c_str(),

                      status);

                abortBrokenDispatchCycleLocked(currentTime, connection, true /*notify*/);

            }

            return;
@@ -3341,8 +3343,9 @@ int InputDispatcher::handleReceiveCallback(int fd, int events, void* data) { 


            notify = status != DEAD_OBJECT || !connection->monitor;

            if (notify) {

                ALOGE("channel '%s' ~ Failed to receive finished signal.  status=%d",

                      connection->getInputChannelName().c_str(), status);

                ALOGE("channel '%s' ~ Failed to receive finished signal.  status=%s(%d)",

                      connection->getInputChannelName().c_str(), statusToString(status).c_str(),

                      status);

            }

        } else {

            // Monitor channels are never explicitly unregistered.