diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-11-05 16:09:48 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-12-12 03:37:19 +0100 |
| commit | 7cdda8879275fe33c065d31db98b4d5b2908ef13 (patch) | |
| tree | 5a4da36274e4360bed0bdcc4131be77ee51b4ef7 | |
| parent | c71a944d5e4be72f1352b5f99e8d273c98c5f8e7 (diff) | |
| download | native-7cdda8879275fe33c065d31db98b4d5b2908ef13.tar.gz | |
Fix some char16_t vs. uint16_t bits
Change-Id: Ie2392098fa6b25f3c0713a7774929e36d824d26f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | include/input/KeyCharacterMap.h | 4 | ||||
| -rw-r--r-- | libs/binder/Parcel.cpp | 2 | ||||
| -rw-r--r-- | libs/input/KeyCharacterMap.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/input/KeyCharacterMap.h b/include/input/KeyCharacterMap.h index e70666ab28..47e0cfb02a 100644 --- a/include/input/KeyCharacterMap.h +++ b/include/input/KeyCharacterMap.h @@ -111,13 +111,13 @@ public: * preferring the one with the specified meta key modifiers. * Returns 0 if no matching character is generated. */ - char16_t getMatch(int32_t keyCode, const char16_t* chars, + char16_t getMatch(int32_t keyCode, const uint16_t* chars, size_t numChars, int32_t metaState) const; /* Gets a sequence of key events that could plausibly generate the specified * character sequence. Returns false if some of the characters cannot be generated. */ - bool getEvents(int32_t deviceId, const char16_t* chars, size_t numChars, + bool getEvents(int32_t deviceId, const uint16_t* chars, size_t numChars, Vector<KeyEvent>& outEvents) const; /* Maps a scan code and usage code to a key code, in case this key map overrides diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 15a5664d3d..9fbb132dd7 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1071,7 +1071,7 @@ String16 Parcel::readString16() const { size_t len; const char16_t* str = readString16Inplace(&len); - if (str) return String16(str, len); + if (str) return String16(reinterpret_cast<const uint16_t*>(str), len); ALOGE("Reading a NULL string not supported here."); return String16(); } diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp index 15a8774477..ac9d536405 100644 --- a/libs/input/KeyCharacterMap.cpp +++ b/libs/input/KeyCharacterMap.cpp @@ -264,7 +264,7 @@ bool KeyCharacterMap::getFallbackAction(int32_t keyCode, int32_t metaState, return result; } -char16_t KeyCharacterMap::getMatch(int32_t keyCode, const char16_t* chars, size_t numChars, +char16_t KeyCharacterMap::getMatch(int32_t keyCode, const uint16_t* chars, size_t numChars, int32_t metaState) const { char16_t result = 0; const Key* key; @@ -294,7 +294,7 @@ char16_t KeyCharacterMap::getMatch(int32_t keyCode, const char16_t* chars, size_ return result; } -bool KeyCharacterMap::getEvents(int32_t deviceId, const char16_t* chars, size_t numChars, +bool KeyCharacterMap::getEvents(int32_t deviceId, const uint16_t* chars, size_t numChars, Vector<KeyEvent>& outEvents) const { nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC); |