Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1

Browse Source
This commit is contained in:
Mathias Agopian
2011-11-04 12:13:36 -07:00
committed by Android (Google) Code Review
parent 45a04db3f9 f61acdac57
commit 515c6b44d5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/sensorservice/SensorService.cpp
View File

@@ -471,14 +471,20 @@ status_t SensorService::setEventRate(const sp<SensorEventConnection>& connection
if (mInitCheck != NO_ERROR)
return mInitCheck;
SensorInterface* sensor = mSensorMap.valueFor(handle);
if (!sensor)
return BAD_VALUE;
if (ns < 0)
return BAD_VALUE;
if (ns == 0) {
ns = sensor->getSensor().getMinDelayNs();
}
if (ns < MINIMUM_EVENTS_PERIOD)
ns = MINIMUM_EVENTS_PERIOD;
SensorInterface* sensor = mSensorMap.valueFor(handle);
if (!sensor) return BAD_VALUE;
return sensor->setDelay(connection.get(), handle, ns);
}