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

Commit bb9ed283 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused parameter displayId"

parents 3666a2ad 7c34b23f

services/inputflinger/InputManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void InputManager::registerInputChannel(const sp<InputChannel>& channel) { 
                "from non shell/root entity (PID: %d)", ipc->getCallingPid());

        return;

    }

    mDispatcher->registerInputChannel(channel, false);

    mDispatcher->registerInputChannel(channel);

}



void InputManager::unregisterInputChannel(const sp<InputChannel>& channel) {

services/inputflinger/dispatcher/InputDispatcher.cpp

+2 −4
Original line number Diff line number Diff line
@@ -3865,11 +3865,9 @@ void InputDispatcher::dumpMonitors(std::string& dump, const std::vector<Monitor> 
    }

}



status_t InputDispatcher::registerInputChannel(const sp<InputChannel>& inputChannel,

                                               int32_t displayId) {

status_t InputDispatcher::registerInputChannel(const sp<InputChannel>& inputChannel) {

#if DEBUG_REGISTRATION

    ALOGD("channel '%s' ~ registerInputChannel - displayId=%" PRId32,

          inputChannel->getName().c_str(), displayId);

    ALOGD("channel '%s' ~ registerInputChannel", inputChannel->getName().c_str());

#endif



    { // acquire lock

services/inputflinger/dispatcher/InputDispatcher.h

+1 −2
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ public: 
    virtual bool transferTouchFocus(const sp<IBinder>& fromToken,

                                    const sp<IBinder>& toToken) override;



    virtual status_t registerInputChannel(const sp<InputChannel>& inputChannel,

                                          int32_t displayId) override;

    virtual status_t registerInputChannel(const sp<InputChannel>& inputChannel) override;

    virtual status_t registerInputMonitor(const sp<InputChannel>& inputChannel, int32_t displayId,

                                          bool isGestureMonitor) override;

    virtual status_t unregisterInputChannel(const sp<InputChannel>& inputChannel) override;

services/inputflinger/dispatcher/include/InputDispatcherInterface.h

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ public: 
     *

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

     */

    virtual status_t registerInputChannel(const sp<InputChannel>& inputChannel,

                                          int32_t displayId) = 0;

    virtual status_t registerInputChannel(const sp<InputChannel>& inputChannel) = 0;



    /* Registers input channels to be used to monitor input events.

     *

services/inputflinger/tests/InputDispatcher_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ public: 
            FakeInputReceiver(dispatcher, name, displayId),

            mFocused(false), mFrame(Rect(0, 0, WIDTH, HEIGHT)), mLayoutParamFlags(0) {

            mServerChannel->setToken(new BBinder());

            mDispatcher->registerInputChannel(mServerChannel, displayId);

            mDispatcher->registerInputChannel(mServerChannel);



            inputApplicationHandle->updateInfo();

            mInfo.applicationInfo = *inputApplicationHandle->getInfo();