am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1

* commit '785fd3685a69e5b3ef9c0958dcf4ae85f818e78d':
  handle EINTR when calling sensor HAL's poll function
This commit is contained in:
Mathias Agopian
2011-11-10 18:35:48 +00:00
committed by Android Git Automerger
2 changed files with 7 additions and 2 deletions

View File

@@ -166,7 +166,11 @@ status_t SensorDevice::initCheck() const {
ssize_t SensorDevice::poll(sensors_event_t* buffer, size_t count) {
if (!mSensorDevice) return NO_INIT;
return mSensorDevice->poll(mSensorDevice, buffer, count);
ssize_t c;
do {
c = mSensorDevice->poll(mSensorDevice, buffer, count);
} while (c == -EINTR);
return c;
}
status_t SensorDevice::activate(void* ident, int handle, int enabled)

View File

@@ -286,7 +286,8 @@ bool SensorService::threadLoop()
}
} while (count >= 0 || Thread::exitPending());
LOGW("Exiting SensorService::threadLoop!");
LOGW("Exiting SensorService::threadLoop => aborting...");
abort();
return false;
}