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

Commit 265e8f48 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Mark InputDispatcher::dump as const" into udc-qpr-dev am: 1bbb0a93 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23625757



Change-Id: I9c406a68b77d7b316af31e33a722a4cba3cdb7bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83431814 1bbb0a93

services/inputflinger/dispatcher/InputDispatcher.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -6590,7 +6590,7 @@ void InputDispatcher::traceWaitQueueLength(const Connection& connection) { 
    }

    }

}

}





void InputDispatcher::dump(std::string& dump) {

void InputDispatcher::dump(std::string& dump) const {

    std::scoped_lock _l(mLock);

    std::scoped_lock _l(mLock);





    dump += "Input Dispatcher State:\n";

    dump += "Input Dispatcher State:\n";

services/inputflinger/dispatcher/InputDispatcher.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ public: 
                             std::chrono::nanoseconds staleEventTimeout);

                             std::chrono::nanoseconds staleEventTimeout);

    ~InputDispatcher() override;

    ~InputDispatcher() override;





    void dump(std::string& dump) override;

    void dump(std::string& dump) const override;

    void monitor() override;

    void monitor() override;

    bool waitForIdle() const override;

    bool waitForIdle() const override;

    status_t start() override;

    status_t start() override;

services/inputflinger/dispatcher/include/InputDispatcherInterface.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ public: 
    /* Dumps the state of the input dispatcher.

    /* Dumps the state of the input dispatcher.

     *

     *

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

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

    virtual void dump(std::string& dump) = 0;

    virtual void dump(std::string& dump) const = 0;





    /* Called by the heatbeat to ensures that the dispatcher has not deadlocked. */

    /* Called by the heatbeat to ensures that the dispatcher has not deadlocked. */

    virtual void monitor() = 0;

    virtual void monitor() = 0;