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

Merge "simplify some unnecessary complex code"

Browse Source
This commit is contained in:
Mathias Agopian 2013-07-08 22:34:54 +00:00 committed by Android (Google) Code Review
commit cf90bad477
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/android/sensor.h
View File

@ -122,6 +122,7 @@ typedef struct ASensorEvent {
float distance; float distance;
float light; float light;
float pressure; float pressure;
float step_counter;
}; };
int32_t reserved1[4]; int32_t reserved1[4];
} ASensorEvent; } ASensorEvent;

19
services/sensorservice/SensorService.cpp
View File

@ -240,7 +240,8 @@ void SensorService::cleanupAutoDisabledSensor(const sp<SensorEventConnection>& c
status_t err = NO_ERROR; status_t err = NO_ERROR;
for (int i=0 ; i<count ; i++) { for (int i=0 ; i<count ; i++) {
int handle = buffer[i].sensor; int handle = buffer[i].sensor;
if (getSensorType(handle) == SENSOR_TYPE_SIGNIFICANT_MOTION) { int type = buffer[i].type;
if (type == SENSOR_TYPE_SIGNIFICANT_MOTION) {
if (connection->hasSensor(handle)) { if (connection->hasSensor(handle)) {
sensor = mSensorMap.valueFor(handle); sensor = mSensorMap.valueFor(handle);
err = sensor ?sensor->resetStateWithoutActuatingHardware(connection.get(), handle) err = sensor ?sensor->resetStateWithoutActuatingHardware(connection.get(), handle)
@ -279,7 +280,7 @@ bool SensorService::threadLoop()
// Todo(): add a flag to the sensors definitions to indicate // Todo(): add a flag to the sensors definitions to indicate
// the sensors which can wake up the AP // the sensors which can wake up the AP
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (getSensorType(buffer[i].sensor) == SENSOR_TYPE_SIGNIFICANT_MOTION) { if (buffer[i].type == SENSOR_TYPE_SIGNIFICANT_MOTION) {
acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME); acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_NAME);
wakeLockAcquired = true; wakeLockAcquired = true;
break; break;
@ -331,7 +332,7 @@ bool SensorService::threadLoop()
// handle backward compatibility for RotationVector sensor // handle backward compatibility for RotationVector sensor
if (halVersion < SENSORS_DEVICE_API_VERSION_1_0) { if (halVersion < SENSORS_DEVICE_API_VERSION_1_0) {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (getSensorType(buffer[i].sensor) == SENSOR_TYPE_ROTATION_VECTOR) { if (buffer[i].type == SENSOR_TYPE_ROTATION_VECTOR) {
// All the 4 components of the quaternion should be available // All the 4 components of the quaternion should be available
// No heading accuracy. Set it to -1 // No heading accuracy. Set it to -1
buffer[i].data[4] = -1; buffer[i].data[4] = -1;
@ -419,18 +420,6 @@ String8 SensorService::getSensorName(int handle) const {
return result; return result;
} }
int SensorService::getSensorType(int handle) const {
size_t count = mUserSensorList.size();
for (size_t i=0 ; i<count ; i++) {
const Sensor& sensor(mUserSensorList[i]);
if (sensor.getHandle() == handle) {
return sensor.getType();
}
}
return -1;
}
Vector<Sensor> SensorService::getSensorList() Vector<Sensor> SensorService::getSensorList()
{ {
char value[PROPERTY_VALUE_MAX]; char value[PROPERTY_VALUE_MAX];

1
services/sensorservice/SensorService.h
View File

@ -111,7 +111,6 @@ class SensorService :
DefaultKeyedVector<int, SensorInterface*> getActiveVirtualSensors() const; DefaultKeyedVector<int, SensorInterface*> getActiveVirtualSensors() const;
String8 getSensorName(int handle) const; String8 getSensorName(int handle) const;
int getSensorType(int handle) const;
void recordLastValue(sensors_event_t const * buffer, size_t count); void recordLastValue(sensors_event_t const * buffer, size_t count);
static void sortEventBuffer(sensors_event_t* buffer, size_t count); static void sortEventBuffer(sensors_event_t* buffer, size_t count);
Sensor registerSensor(SensorInterface* sensor); Sensor registerSensor(SensorInterface* sensor);