diff options
| author | 2018-06-08 15:11:57 -0700 | |
|---|---|---|
| committer | 2018-06-08 15:11:57 -0700 | |
| commit | f11e2bd016d886a333345dea853ebda23a408d5c (patch) | |
| tree | 905bd4d25d6ab2b046620ff459777d8dcfa5d7de /services/inputflinger/EventHub.h | |
| parent | aabd6b7fa343654cd85b3b2da392e424d037d15a (diff) | |
| parent | 5c947cdf72270fd1f766b2248d526ebc8c7227f6 (diff) | |
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I6d6bee71b9424eb478780bbfc06b830eb8ded342
Diffstat (limited to 'services/inputflinger/EventHub.h')
| -rw-r--r-- | services/inputflinger/EventHub.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/inputflinger/EventHub.h b/services/inputflinger/EventHub.h index 727b73aeb8..66bc29456b 100644 --- a/services/inputflinger/EventHub.h +++ b/services/inputflinger/EventHub.h @@ -24,7 +24,6 @@ #include <input/KeyLayoutMap.h> #include <input/KeyCharacterMap.h> #include <input/VirtualKeyMap.h> -#include <utils/String8.h> #include <utils/Mutex.h> #include <utils/Log.h> #include <utils/List.h> @@ -262,7 +261,7 @@ public: virtual void wake() = 0; /* Dump EventHub state to a string. */ - virtual void dump(String8& dump) = 0; + virtual void dump(std::string& dump) = 0; /* Called by the heatbeat to ensures that the reader has not deadlocked. */ virtual void monitor() = 0; @@ -333,7 +332,7 @@ public: virtual void wake(); - virtual void dump(String8& dump); + virtual void dump(std::string& dump); virtual void monitor(); protected: |