summaryrefslogtreecommitdiffstats
path: root/include/utils/Tokenizer.h
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-12-02 13:50:46 -0800
committerAlex Ray <aray@google.com>2013-07-30 13:56:55 -0700
commit1d618d63c1bb99728b5b0afe320f5a6afa95436c (patch)
tree063d271af206fc8f3e098fe77aea64e96c045b62 /include/utils/Tokenizer.h
parent04cbbc1c47c68e805d2674d9fc702fc44385805f (diff)
downloadcore-1d618d63c1bb99728b5b0afe320f5a6afa95436c.tar.gz
core-1d618d63c1bb99728b5b0afe320f5a6afa95436c.tar.bz2
core-1d618d63c1bb99728b5b0afe320f5a6afa95436c.zip
Improve support for external keyboards.
Use Vendor ID, Product ID and optionally the Version to locate keymaps and configuration files for external devices. Moved virtual key definition parsing to native code so that EventHub can identify touch screens with virtual keys and load the appropriate key layout file. Cleaned up a lot of old code in EventHub. Fixed a regression in ViewRoot's fallback event handling. Fixed a minor bug in FileMap that caused it to try to munmap or close invalid handled when released if the attempt to map the file failed. Added a couple of new String8 conveniences for formatting strings. Modified Tokenizer to fall back to open+read when mmap fails since we can't mmap sysfs files as needed to open the virtual key definition files in /sys/board_properties/. Change-Id: I6ca5e5f9547619fd082ddac47e87ce185da69ee6
Diffstat (limited to 'include/utils/Tokenizer.h')
-rw-r--r--include/utils/Tokenizer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/utils/Tokenizer.h b/include/utils/Tokenizer.h
index 21e58e62c..c7db5fb9e 100644
--- a/include/utils/Tokenizer.h
+++ b/include/utils/Tokenizer.h
@@ -28,7 +28,7 @@ namespace android {
* A simple tokenizer for loading and parsing ASCII text files line by line.
*/
class Tokenizer {
- Tokenizer(const String8& filename, FileMap* fileMap, const char* buffer, size_t length);
+ Tokenizer(const String8& filename, FileMap* fileMap, char* buffer, size_t length);
public:
~Tokenizer();
@@ -110,7 +110,7 @@ private:
String8 mFilename;
FileMap* mFileMap;
- const char* mBuffer;
+ char* mBuffer;
size_t mLength;
const char* mCurrent;