diff options
author | 2015-07-28 13:49:04 -0700 | |
---|---|---|
committer | 2015-07-28 13:49:04 -0700 | |
commit | d4036b6b7f9609fe09efabdbfbb8c8f9428f76f7 (patch) | |
tree | 6df78554b03a38c87a537900c12700b5db254703 | |
parent | 59fe878cca656bdd7d453137a6934a7fdc90ab81 (diff) |
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
Change-Id: I5e48dce36678c12069c0e162b920870de81b89f2
-rw-r--r-- | services/sensorservice/BatteryService.cpp | 2 | ||||
-rw-r--r-- | services/sensorservice/GravitySensor.cpp | 1 | ||||
-rw-r--r-- | services/sensorservice/SensorDevice.cpp | 2 | ||||
-rw-r--r-- | services/sensorservice/SensorService.cpp | 10 | ||||
-rw-r--r-- | services/sensorservice/vec.h | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/services/sensorservice/BatteryService.cpp b/services/sensorservice/BatteryService.cpp index cb962a6349..81f32cdc58 100644 --- a/services/sensorservice/BatteryService.cpp +++ b/services/sensorservice/BatteryService.cpp @@ -83,7 +83,7 @@ void BatteryService::cleanupImpl(uid_t uid) { if (mBatteryStatService != 0) { Mutex::Autolock _l(mActivationsLock); int64_t identity = IPCThreadState::self()->clearCallingIdentity(); - for (ssize_t i=0 ; i<mActivations.size() ; i++) { + for (size_t i=0 ; i<mActivations.size() ; i++) { const Info& info(mActivations[i]); if (info.uid == uid) { mBatteryStatService->noteStopSensor(info.uid, info.handle); diff --git a/services/sensorservice/GravitySensor.cpp b/services/sensorservice/GravitySensor.cpp index 3cb3745202..61118bc54a 100644 --- a/services/sensorservice/GravitySensor.cpp +++ b/services/sensorservice/GravitySensor.cpp @@ -44,7 +44,6 @@ GravitySensor::GravitySensor(sensor_t const* list, size_t count) bool GravitySensor::process(sensors_event_t* outEvent, const sensors_event_t& event) { - const static double NS2S = 1.0 / 1000000000.0; if (event.type == SENSOR_TYPE_ACCELEROMETER) { vec3_t g; if (!mSensorFusion.hasEstimate()) diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp index dd1bccfbec..40d596f36b 100644 --- a/services/sensorservice/SensorDevice.cpp +++ b/services/sensorservice/SensorDevice.cpp @@ -388,7 +388,7 @@ void SensorDevice::disableAllSensors() { status_t SensorDevice::injectSensorData(const sensors_event_t *injected_sensor_event) { ALOGD_IF(DEBUG_CONNECTIONS, - "sensor_event handle=%d ts=%lld data=%.2f, %.2f, %.2f %.2f %.2f %.2f", + "sensor_event handle=%d ts=%" PRId64 " data=%.2f, %.2f, %.2f %.2f %.2f %.2f", injected_sensor_event->sensor, injected_sensor_event->timestamp, injected_sensor_event->data[0], injected_sensor_event->data[1], injected_sensor_event->data[2], diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index 40b21a96a0..1a486a34c8 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -118,7 +118,7 @@ void SensorService::onFirstRef() // it's safe to instantiate the SensorFusion object here // (it wants to be instantiated after h/w sensors have been // registered) - const SensorFusion& fusion(SensorFusion::getInstance()); + SensorFusion::getInstance(); // build the sensor list returned to users mUserSensorList = mSensorList; @@ -381,7 +381,7 @@ status_t SensorService::dump(int fd, const Vector<String16>& args) mActiveSensors.valueAt(i)->getNumConnections()); } - result.appendFormat("Socket Buffer size = %d events\n", + result.appendFormat("Socket Buffer size = %zd events\n", mSocketBufferSize/sizeof(sensors_event_t)); result.appendFormat("WakeLock Status: %s \n", mWakeLockAcquired ? "acquired" : "not held"); @@ -1104,7 +1104,7 @@ bool SensorService::canAccessSensor(const Sensor& sensor, const char* operation, AppOpsManager appOps; if (appOps.noteOp(opCode, IPCThreadState::self()->getCallingUid(), opPackageName) != AppOpsManager::MODE_ALLOWED) { - ALOGE("%s a sensor (%s) without enabled required app op: %D", + ALOGE("%s a sensor (%s) without enabled required app op: %d", operation, sensor.getName().string(), opCode); return false; } @@ -1307,13 +1307,13 @@ void SensorService::CircularBuffer::printBuffer(String8& result) const { } result.appendFormat("%d) ", eventNum++); if (mSensorType == SENSOR_TYPE_STEP_COUNTER) { - result.appendFormat("%llu,", mTrimmedSensorEventArr[i]->mStepCounter); + result.appendFormat("%" PRIu64 ",", mTrimmedSensorEventArr[i]->mStepCounter); } else { for (int j = 0; j < numData; ++j) { result.appendFormat("%5.1f,", mTrimmedSensorEventArr[i]->mData[j]); } } - result.appendFormat("%lld %02d:%02d:%02d ", mTrimmedSensorEventArr[i]->mTimestamp, + result.appendFormat("%" PRId64 " %02d:%02d:%02d ", mTrimmedSensorEventArr[i]->mTimestamp, mTrimmedSensorEventArr[i]->mHour, mTrimmedSensorEventArr[i]->mMin, mTrimmedSensorEventArr[i]->mSec); i = (i + 1) % mBufSize; diff --git a/services/sensorservice/vec.h b/services/sensorservice/vec.h index 24f30ff436..a142bad3a1 100644 --- a/services/sensorservice/vec.h +++ b/services/sensorservice/vec.h @@ -37,7 +37,7 @@ template <typename TYPE, size_t SIZE> class vec; template <typename TYPE, size_t SIZE> -class vbase; +struct vbase; namespace helpers { |