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

Commit 180c38dd authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7292112 from e4d7d43d to sc-release 

Change-Id: Ibc8b50d819b60263330fe6e5e3dc7fd013a01c1f
parents 0fcad863 e4d7d43d

libs/binder/RpcState.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ status_t RpcState::onBinderLeaving(const sp<RpcConnection>& connection, const sp 
        // We need to be able to send instructions over the socket for how to

        // connect to a different server, and we also need to let the host

        // process know that this is happening.

        ALOGE("Canot send binder from unrelated binder RPC connection.");

        ALOGE("Cannot send binder from unrelated binder RPC connection.");

        return INVALID_OPERATION;

    }

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.