| commit | 265e8f48be22226c53e71378a7da24931a4a49bb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jul 13 17:18:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 13 17:18:54 2023 +0000 |
| tree | 2855b47c26b420b41058b88d5076d86b34178a4a | |
| parent | 834318142cf4130b5233cec3e09fd420bb79e6f7 [diff] | |
| parent | 1bbb0a93c8fda9f7fe0384b6138030cdebdb3324 [diff] |
Merge "Mark InputDispatcher::dump as const" into udc-qpr-dev am: 1bbb0a93c8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23625757 Change-Id: I9c406a68b77d7b316af31e33a722a4cba3cdb7bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp index 3545b98..0e268e9 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.cpp +++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -6590,7 +6590,7 @@ } } -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 37f569e..2b8b37e 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.h +++ b/services/inputflinger/dispatcher/InputDispatcher.h
@@ -87,7 +87,7 @@ 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 49597e2..6a07e59 100644 --- a/services/inputflinger/dispatcher/include/InputDispatcherInterface.h +++ b/services/inputflinger/dispatcher/include/InputDispatcherInterface.h
@@ -39,7 +39,7 @@ /* 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;