summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-07-13 16:04:03 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-07-13 16:04:03 +0000
commit1bbb0a93c8fda9f7fe0384b6138030cdebdb3324 (patch)
tree1b35e76b65613fff8e3fb3caf4d03f7290213698
parent5443413a3f486e7a7d7a02948deba9ec4719a912 (diff)
parent5e20f27d19c1f1a869d5ac11d5271394990fc59d (diff)
Merge "Mark InputDispatcher::dump as const" into udc-qpr-dev
-rw-r--r--services/inputflinger/dispatcher/InputDispatcher.cpp2
-rw-r--r--services/inputflinger/dispatcher/InputDispatcher.h2
-rw-r--r--services/inputflinger/dispatcher/include/InputDispatcherInterface.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 65bd05b6d2..df3f7d99af 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -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);
dump += "Input Dispatcher State:\n";
diff --git a/services/inputflinger/dispatcher/InputDispatcher.h b/services/inputflinger/dispatcher/InputDispatcher.h
index 37f569ee97..2b8b37e42a 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.h
+++ b/services/inputflinger/dispatcher/InputDispatcher.h
@@ -87,7 +87,7 @@ public:
std::chrono::nanoseconds staleEventTimeout);
~InputDispatcher() override;
- void dump(std::string& dump) override;
+ void dump(std::string& dump) const override;
void monitor() override;
bool waitForIdle() const override;
status_t start() override;
diff --git a/services/inputflinger/dispatcher/include/InputDispatcherInterface.h b/services/inputflinger/dispatcher/include/InputDispatcherInterface.h
index 49597e2101..6a07e59827 100644
--- a/services/inputflinger/dispatcher/include/InputDispatcherInterface.h
+++ b/services/inputflinger/dispatcher/include/InputDispatcherInterface.h
@@ -39,7 +39,7 @@ public:
/* Dumps the state of the input dispatcher.
*
* 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. */
virtual void monitor() = 0;