am 9e6842ca: Merge change 23168 into eclair

Merge commit '9e6842caa8334f78744dee77d476ac6eec5b7540' into eclair-plus-aosp

* commit '9e6842caa8334f78744dee77d476ac6eec5b7540':
  EventHub: Fix file descriptor leak.
This commit is contained in:
Mike Lockwood
2009-08-28 13:32:58 -07:00
committed by Android Git Automerger

View File

@@ -784,6 +784,7 @@ int EventHub::close_device(const char *deviceName)
int count = mFDCount - i - 1; int count = mFDCount - i - 1;
int index = (device->id&ID_MASK); int index = (device->id&ID_MASK);
mDevicesById[index].device = NULL; mDevicesById[index].device = NULL;
close(mFDs[i].fd);
memmove(mDevices + i, mDevices + i + 1, sizeof(mDevices[0]) * count); memmove(mDevices + i, mDevices + i + 1, sizeof(mDevices[0]) * count);
memmove(mFDs + i, mFDs + i + 1, sizeof(mFDs[0]) * count); memmove(mFDs + i, mFDs + i + 1, sizeof(mFDs[0]) * count);