ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix getSwitchState according to device capabilities.

Browse Source 
When querying switch state for a given device id, ensure that the device
exposes the given switch in its capabilities, report AKEY_STATE_UNKNOWN
otherwise.
This fix a bug in InputManager that reports an incorrect switch state
(down) when a device exposes at least one switch in its capabilites and
another switch is queried. For example, this can leads in always
reporting LID state open (SW_LID down) if only SW_HEADPHONE_INSERT is
exposed in capabilities.

Change-Id: I4e5265ec02af918c317673789e7948529842aa2d
Signed-off-by: Michaël Burtin <mburtin@gmail.com>
This commit is contained in:
Michaël Burtin 2011-07-29 14:25:47 +02:00
parent 7c95ffbbcc
commit 5aa3d79025
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ui/EventHub.h
View File

@ -239,6 +239,7 @@ private:
String8 name;
uint32_t classes;
uint8_t* keyBitmask;
uint8_t* switchBitmask;
KeyLayoutMap* layoutMap;
String8 keylayoutFilename;
int fd;

25
libs/ui/EventHub.cpp
View File

@ -94,11 +94,13 @@ static inline const char* toString(bool value) {
EventHub::device_t::device_t(int32_t _id, const char* _path, const char* name)
: id(_id), path(_path), name(name), classes(0)
, keyBitmask(NULL), layoutMap(new KeyLayoutMap()), fd(-1), next(NULL) {
, keyBitmask(NULL), switchBitmask(NULL)
, layoutMap(new KeyLayoutMap()), fd(-1), next(NULL) {
}
EventHub::device_t::~device_t() {
delete [] keyBitmask;
delete [] switchBitmask;
delete layoutMap;
}
@ -243,11 +245,14 @@ int32_t EventHub::getSwitchState(int32_t deviceId, int32_t sw) const {
}
int32_t EventHub::getSwitchStateLocked(device_t* device, int32_t sw) const {
uint8_t sw_bitmask[sizeof_bit_array(SW_MAX + 1)];
memset(sw_bitmask, 0, sizeof(sw_bitmask));
if (ioctl(device->fd,
EVIOCGSW(sizeof(sw_bitmask)), sw_bitmask) >= 0) {
return test_bit(sw, sw_bitmask) ? AKEY_STATE_DOWN : AKEY_STATE_UP;
if (device->switchBitmask != NULL
&& test_bit(sw, device->switchBitmask)) {
uint8_t sw_bitmask[sizeof_bit_array(SW_MAX + 1)];
memset(sw_bitmask, 0, sizeof(sw_bitmask));
if (ioctl(device->fd,
EVIOCGSW(sizeof(sw_bitmask)), sw_bitmask) >= 0) {
return test_bit(sw, sw_bitmask) ? AKEY_STATE_DOWN : AKEY_STATE_UP;
}
}
return AKEY_STATE_UNKNOWN;
}
@ -759,6 +764,14 @@ int EventHub::openDevice(const char *deviceName) {
}
if (hasSwitches) {
device->classes |= INPUT_DEVICE_CLASS_SWITCH;
device->switchBitmask = new uint8_t[sizeof(sw_bitmask)];
if (device->switchBitmask != NULL) {
memcpy(device->switchBitmask, sw_bitmask, sizeof(sw_bitmask));
} else {
delete device;
LOGE("out of memory allocating switch bitmask");
return -1;
}
}
#endif