Backed out changeset 7eadbb66c48f (bug 904544) due to reading comprehension fail.

This commit is contained in:
Ryan VanderMeulen 2013-08-29 10:08:10 -04:00
parent e8a3fc0a1b
commit 654c00c134
2 changed files with 2 additions and 11 deletions

View File

@ -1078,21 +1078,14 @@ status_t EventHub::openDeviceLocked(const char *devicePath) {
return -1;
}
// Enable wake-lock behavior on kernels that support it.
// TODO: Only need this for devices that can really wake the system.
bool usingSuspendBlock = !ioctl(fd, EVIOCSSUSPENDBLOCK, 1);
ALOGI("New device: id=%d, fd=%d, path='%s', name='%s', classes=0x%x, "
"configuration='%s', keyLayout='%s', keyCharacterMap='%s', builtinKeyboard=%s, "
"usingSuspendBlock=%s",
"configuration='%s', keyLayout='%s', keyCharacterMap='%s', builtinKeyboard=%s",
deviceId, fd, devicePath, device->identifier.name.string(),
device->classes,
device->configurationFile.string(),
device->keyMap.keyLayoutFile.string(),
device->keyMap.keyCharacterMapFile.string(),
toString(mBuiltInKeyboardId == deviceId),
toString(usingSuspendBlock));
toString(mBuiltInKeyboardId == deviceId));
mDevices.add(deviceId, device);

View File

@ -74,8 +74,6 @@ struct input_keymap_entry {
#define EVIOCRMFF _IOW('E', 0x81, int)
#define EVIOCGEFFECTS _IOR('E', 0x84, int)
#define EVIOCGRAB _IOW('E', 0x90, int)
#define EVIOCGSUSPENDBLOCK _IOR('E', 0x91, int) /* get suspend block enable */
#define EVIOCSSUSPENDBLOCK _IOW('E', 0x91, int) /* set suspend block enable */
#define INPUT_PROP_POINTER 0x00
#define INPUT_PROP_DIRECT 0x01
#define INPUT_PROP_BUTTONPAD 0x02