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

Commit 58cfc60c authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Add pid to monitor 

The dispatcher will now have pid information of each monitor. This
information will be used to raise ANRs.

Bug: 175593831
Test: atest inputflinger_tests
Change-Id: Ief3bbe36e06ac7c36039f08739fc10b3c2291530
parent fc4d0494

services/inputflinger/dispatcher/InputDispatcher.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4827,7 +4827,7 @@ base::Result<std::unique_ptr<InputChannel>> InputDispatcher::createInputChannel( 
}



base::Result<std::unique_ptr<InputChannel>> InputDispatcher::createInputMonitor(

        int32_t displayId, bool isGestureMonitor, const std::string& name) {

        int32_t displayId, bool isGestureMonitor, const std::string& name, int32_t pid) {

    std::shared_ptr<InputChannel> serverChannel;

    std::unique_ptr<InputChannel> clientChannel;

    status_t result = openInputChannelPair(name, serverChannel, clientChannel);
@@ -4851,7 +4851,7 @@ base::Result<std::unique_ptr<InputChannel>> InputDispatcher::createInputMonitor( 


        auto& monitorsByDisplay =

                isGestureMonitor ? mGestureMonitorsByDisplay : mGlobalMonitorsByDisplay;

        monitorsByDisplay[displayId].emplace_back(serverChannel);

        monitorsByDisplay[displayId].emplace_back(serverChannel, pid);



        mLooper->addFd(fd, 0, ALOOPER_EVENT_INPUT, handleReceiveCallback, this);

    }

services/inputflinger/dispatcher/InputDispatcher.h

+4 −2
Original line number Diff line number Diff line
@@ -123,8 +123,10 @@ public: 
    virtual base::Result<std::unique_ptr<InputChannel>> createInputChannel(

            const std::string& name) override;

    virtual void setFocusedWindow(const FocusRequest&) override;

    virtual base::Result<std::unique_ptr<InputChannel>> createInputMonitor(

            int32_t displayId, bool isGestureMonitor, const std::string& name) override;

    virtual base::Result<std::unique_ptr<InputChannel>> createInputMonitor(int32_t displayId,

                                                                           bool isGestureMonitor,

                                                                           const std::string& name,

                                                                           int32_t pid) override;

    virtual status_t removeInputChannel(const sp<IBinder>& connectionToken) override;

    virtual status_t pilferPointers(const sp<IBinder>& token) override;

    virtual void requestPointerCapture(const sp<IBinder>& windowToken, bool enabled) override;

services/inputflinger/dispatcher/Monitor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
namespace android::inputdispatcher {



// --- Monitor ---

Monitor::Monitor(const std::shared_ptr<InputChannel>& inputChannel) : inputChannel(inputChannel) {}

Monitor::Monitor(const std::shared_ptr<InputChannel>& inputChannel, int32_t pid)

      : inputChannel(inputChannel), pid(pid) {}



// --- TouchedMonitor ---

TouchedMonitor::TouchedMonitor(const Monitor& monitor, float xOffset, float yOffset)

services/inputflinger/dispatcher/Monitor.h

+3 −1
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ namespace android::inputdispatcher { 
struct Monitor {

    std::shared_ptr<InputChannel> inputChannel; // never null



    explicit Monitor(const std::shared_ptr<InputChannel>& inputChannel);

    int32_t pid;



    explicit Monitor(const std::shared_ptr<InputChannel>& inputChannel, int32_t pid);

};



// For tracking the offsets we need to apply when adding gesture monitor targets.

services/inputflinger/dispatcher/include/InputDispatcherInterface.h

+4 −2
Original line number Diff line number Diff line
@@ -172,8 +172,10 @@ public: 
     *

     * This method may be called on any thread (usually by the input manager).

     */

    virtual base::Result<std::unique_ptr<InputChannel>> createInputMonitor(

            int32_t displayId, bool gestureMonitor, const std::string& name) = 0;

    virtual base::Result<std::unique_ptr<InputChannel>> createInputMonitor(int32_t displayId,

                                                                           bool gestureMonitor,

                                                                           const std::string& name,

                                                                           int32_t pid) = 0;



    /* Removes input channels that will no longer receive input events.

     *