summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe2015-07-28 15:49:04 -0500
committerAndreas Gampe2015-08-12 16:24:19 -0500
commit18343a2fd11583b884d1566a232a75b004fb3813 (patch)
treea2343a13968cc9eb9e497b09d1833cf41b4b8b36 /services
parent2284454410faac03c50e5821844e96b151032735 (diff)
downloadframeworks-native-18343a2fd11583b884d1566a232a75b004fb3813.tar.gz
frameworks-native-18343a2fd11583b884d1566a232a75b004fb3813.tar.xz
frameworks-native-18343a2fd11583b884d1566a232a75b004fb3813.zip
SensorService: Fix some warnings
For build-system CFLAGS clean-up, remove unused variables. Also fix some warnings related to format strings, and signed comparisons. Bug: 18632512 (cherry picked from commit d4036b6b7f9609fe09efabdbfbb8c8f9428f76f7) Change-Id: I5e48dce36678c12069c0e162b920870de81b89f2
Diffstat (limited to 'services')
-rw-r--r--services/sensorservice/BatteryService.cpp2
-rw-r--r--services/sensorservice/GravitySensor.cpp1
-rw-r--r--services/sensorservice/SensorDevice.cpp2
-rw-r--r--services/sensorservice/SensorService.cpp10
-rw-r--r--services/sensorservice/vec.h2
5 files changed, 8 insertions, 9 deletions
diff --git a/services/sensorservice/BatteryService.cpp b/services/sensorservice/BatteryService.cpp
index cb962a634..81f32cdc5 100644
--- a/services/sensorservice/BatteryService.cpp
+++ b/services/sensorservice/BatteryService.cpp
@@ -83,7 +83,7 @@ void BatteryService::cleanupImpl(uid_t uid) {
83 if (mBatteryStatService != 0) { 83 if (mBatteryStatService != 0) {
84 Mutex::Autolock _l(mActivationsLock); 84 Mutex::Autolock _l(mActivationsLock);
85 int64_t identity = IPCThreadState::self()->clearCallingIdentity(); 85 int64_t identity = IPCThreadState::self()->clearCallingIdentity();
86 for (ssize_t i=0 ; i<mActivations.size() ; i++) { 86 for (size_t i=0 ; i<mActivations.size() ; i++) {
87 const Info& info(mActivations[i]); 87 const Info& info(mActivations[i]);
88 if (info.uid == uid) { 88 if (info.uid == uid) {
89 mBatteryStatService->noteStopSensor(info.uid, info.handle); 89 mBatteryStatService->noteStopSensor(info.uid, info.handle);
diff --git a/services/sensorservice/GravitySensor.cpp b/services/sensorservice/GravitySensor.cpp
index 3cb374520..61118bc54 100644
--- a/services/sensorservice/GravitySensor.cpp
+++ b/services/sensorservice/GravitySensor.cpp
@@ -44,7 +44,6 @@ GravitySensor::GravitySensor(sensor_t const* list, size_t count)
44bool GravitySensor::process(sensors_event_t* outEvent, 44bool GravitySensor::process(sensors_event_t* outEvent,
45 const sensors_event_t& event) 45 const sensors_event_t& event)
46{ 46{
47 const static double NS2S = 1.0 / 1000000000.0;
48 if (event.type == SENSOR_TYPE_ACCELEROMETER) { 47 if (event.type == SENSOR_TYPE_ACCELEROMETER) {
49 vec3_t g; 48 vec3_t g;
50 if (!mSensorFusion.hasEstimate()) 49 if (!mSensorFusion.hasEstimate())
diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index dd1bccfbe..40d596f36 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -388,7 +388,7 @@ void SensorDevice::disableAllSensors() {
388 388
389status_t SensorDevice::injectSensorData(const sensors_event_t *injected_sensor_event) { 389status_t SensorDevice::injectSensorData(const sensors_event_t *injected_sensor_event) {
390 ALOGD_IF(DEBUG_CONNECTIONS, 390 ALOGD_IF(DEBUG_CONNECTIONS,
391 "sensor_event handle=%d ts=%lld data=%.2f, %.2f, %.2f %.2f %.2f %.2f", 391 "sensor_event handle=%d ts=%" PRId64 " data=%.2f, %.2f, %.2f %.2f %.2f %.2f",
392 injected_sensor_event->sensor, 392 injected_sensor_event->sensor,
393 injected_sensor_event->timestamp, injected_sensor_event->data[0], 393 injected_sensor_event->timestamp, injected_sensor_event->data[0],
394 injected_sensor_event->data[1], injected_sensor_event->data[2], 394 injected_sensor_event->data[1], injected_sensor_event->data[2],
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 40b21a96a..1a486a34c 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -118,7 +118,7 @@ void SensorService::onFirstRef()
118 // it's safe to instantiate the SensorFusion object here 118 // it's safe to instantiate the SensorFusion object here
119 // (it wants to be instantiated after h/w sensors have been 119 // (it wants to be instantiated after h/w sensors have been
120 // registered) 120 // registered)
121 const SensorFusion& fusion(SensorFusion::getInstance()); 121 SensorFusion::getInstance();
122 122
123 // build the sensor list returned to users 123 // build the sensor list returned to users
124 mUserSensorList = mSensorList; 124 mUserSensorList = mSensorList;
@@ -381,7 +381,7 @@ status_t SensorService::dump(int fd, const Vector<String16>& args)
381 mActiveSensors.valueAt(i)->getNumConnections()); 381 mActiveSensors.valueAt(i)->getNumConnections());
382 } 382 }
383 383
384 result.appendFormat("Socket Buffer size = %d events\n", 384 result.appendFormat("Socket Buffer size = %zd events\n",
385 mSocketBufferSize/sizeof(sensors_event_t)); 385 mSocketBufferSize/sizeof(sensors_event_t));
386 result.appendFormat("WakeLock Status: %s \n", mWakeLockAcquired ? "acquired" : 386 result.appendFormat("WakeLock Status: %s \n", mWakeLockAcquired ? "acquired" :
387 "not held"); 387 "not held");
@@ -1104,7 +1104,7 @@ bool SensorService::canAccessSensor(const Sensor& sensor, const char* operation,
1104 AppOpsManager appOps; 1104 AppOpsManager appOps;
1105 if (appOps.noteOp(opCode, IPCThreadState::self()->getCallingUid(), opPackageName) 1105 if (appOps.noteOp(opCode, IPCThreadState::self()->getCallingUid(), opPackageName)
1106 != AppOpsManager::MODE_ALLOWED) { 1106 != AppOpsManager::MODE_ALLOWED) {
1107 ALOGE("%s a sensor (%s) without enabled required app op: %D", 1107 ALOGE("%s a sensor (%s) without enabled required app op: %d",
1108 operation, sensor.getName().string(), opCode); 1108 operation, sensor.getName().string(), opCode);
1109 return false; 1109 return false;
1110 } 1110 }
@@ -1307,13 +1307,13 @@ void SensorService::CircularBuffer::printBuffer(String8& result) const {
1307 } 1307 }
1308 result.appendFormat("%d) ", eventNum++); 1308 result.appendFormat("%d) ", eventNum++);
1309 if (mSensorType == SENSOR_TYPE_STEP_COUNTER) { 1309 if (mSensorType == SENSOR_TYPE_STEP_COUNTER) {
1310 result.appendFormat("%llu,", mTrimmedSensorEventArr[i]->mStepCounter); 1310 result.appendFormat("%" PRIu64 ",", mTrimmedSensorEventArr[i]->mStepCounter);
1311 } else { 1311 } else {
1312 for (int j = 0; j < numData; ++j) { 1312 for (int j = 0; j < numData; ++j) {
1313 result.appendFormat("%5.1f,", mTrimmedSensorEventArr[i]->mData[j]); 1313 result.appendFormat("%5.1f,", mTrimmedSensorEventArr[i]->mData[j]);
1314 } 1314 }
1315 } 1315 }
1316 result.appendFormat("%lld %02d:%02d:%02d ", mTrimmedSensorEventArr[i]->mTimestamp, 1316 result.appendFormat("%" PRId64 " %02d:%02d:%02d ", mTrimmedSensorEventArr[i]->mTimestamp,
1317 mTrimmedSensorEventArr[i]->mHour, mTrimmedSensorEventArr[i]->mMin, 1317 mTrimmedSensorEventArr[i]->mHour, mTrimmedSensorEventArr[i]->mMin,
1318 mTrimmedSensorEventArr[i]->mSec); 1318 mTrimmedSensorEventArr[i]->mSec);
1319 i = (i + 1) % mBufSize; 1319 i = (i + 1) % mBufSize;
diff --git a/services/sensorservice/vec.h b/services/sensorservice/vec.h
index 24f30ff43..a142bad3a 100644
--- a/services/sensorservice/vec.h
+++ b/services/sensorservice/vec.h
@@ -37,7 +37,7 @@ template <typename TYPE, size_t SIZE>
37class vec; 37class vec;
38 38
39template <typename TYPE, size_t SIZE> 39template <typename TYPE, size_t SIZE>
40class vbase; 40struct vbase;
41 41
42namespace helpers { 42namespace helpers {
43 43