summaryrefslogtreecommitdiff
path: root/libs/ui/KeyCharacterMap.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2011-11-15 19:19:04 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-15 19:19:04 -0800
commit4c0e0dd29dcce33e7521b11d01d21d9431f3b264 (patch)
tree14b19d7f750f12c4168bb582c1cd99e93afd454a /libs/ui/KeyCharacterMap.cpp
parentcbcf8259697d2cb9025657a88e01cbb84be11d70 (diff)
parent3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef (diff)
am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef': Eliminate hw.keyboards system properties.
Diffstat (limited to 'libs/ui/KeyCharacterMap.cpp')
-rw-r--r--libs/ui/KeyCharacterMap.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/libs/ui/KeyCharacterMap.cpp b/libs/ui/KeyCharacterMap.cpp
index 2decfe93215a..77f18dec5c9f 100644
--- a/libs/ui/KeyCharacterMap.cpp
+++ b/libs/ui/KeyCharacterMap.cpp
@@ -124,17 +124,6 @@ status_t KeyCharacterMap::load(const String8& filename, KeyCharacterMap** outMap
return status;
}
-status_t KeyCharacterMap::loadByDeviceId(int32_t deviceId, KeyCharacterMap** outMap) {
- *outMap = NULL;
-
- String8 filename;
- status_t result = getKeyCharacterMapFile(deviceId, filename);
- if (!result) {
- result = load(filename, outMap);
- }
- return result;
-}
-
int32_t KeyCharacterMap::getKeyboardType() const {
return mType;
}