diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-12 16:13:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 16:13:39 +0000 |
| commit | c46422ed2bf2e452d878a45735f4d37917008843 (patch) | |
| tree | 4f11de6915db5c67f2085d9641b63a102e5c9a3f /services/sensorservice/SensorService.cpp | |
| parent | eeb0f39f76a29271c9436157bd84a3a2f0e0f43d (diff) | |
| parent | 20914f0ad3691d977f61f1d4b92b49535e8f6f33 (diff) | |
| download | frameworks_native-c46422ed2bf2e452d878a45735f4d37917008843.zip frameworks_native-c46422ed2bf2e452d878a45735f4d37917008843.tar.gz frameworks_native-c46422ed2bf2e452d878a45735f4d37917008843.tar.bz2 | |
am 20914f0a: am a4e345e1: Merge "sensorservice: 64-bit compile issues"
* commit '20914f0ad3691d977f61f1d4b92b49535e8f6f33':
sensorservice: 64-bit compile issues
Diffstat (limited to 'services/sensorservice/SensorService.cpp')
| -rw-r--r-- | services/sensorservice/SensorService.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index 1bee04f..2f6a00b 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -378,7 +378,7 @@ bool SensorService::threadLoop() for (size_t j=0 ; j<activeVirtualSensorCount ; j++) { if (count + k >= minBufferSize) { ALOGE("buffer too small to hold all events: " - "count=%u, k=%u, size=%u", + "count=%zd, k=%zu, size=%zu", count, k, minBufferSize); break; } @@ -522,11 +522,11 @@ void SensorService::cleanupConnection(SensorEventConnection* c) Mutex::Autolock _l(mLock); const wp<SensorEventConnection> connection(c); size_t size = mActiveSensors.size(); - ALOGD_IF(DEBUG_CONNECTIONS, "%d active sensors", size); + ALOGD_IF(DEBUG_CONNECTIONS, "%zu active sensors", size); for (size_t i=0 ; i<size ; ) { int handle = mActiveSensors.keyAt(i); if (c->hasSensor(handle)) { - ALOGD_IF(DEBUG_CONNECTIONS, "%i: disabling handle=0x%08x", i, handle); + ALOGD_IF(DEBUG_CONNECTIONS, "%zu: disabling handle=0x%08x", i, handle); SensorInterface* sensor = mSensorMap.valueFor( handle ); ALOGE_IF(!sensor, "mSensorMap[handle=0x%08x] is null!", handle); if (sensor) { @@ -534,9 +534,9 @@ void SensorService::cleanupConnection(SensorEventConnection* c) } } SensorRecord* rec = mActiveSensors.valueAt(i); - ALOGE_IF(!rec, "mActiveSensors[%d] is null (handle=0x%08x)!", i, handle); + ALOGE_IF(!rec, "mActiveSensors[%zu] is null (handle=0x%08x)!", i, handle); ALOGD_IF(DEBUG_CONNECTIONS, - "removing connection %p for sensor[%d].handle=0x%08x", + "removing connection %p for sensor[%zu].handle=0x%08x", c, i, handle); if (rec && rec->removeConnection(connection)) { @@ -625,7 +625,7 @@ status_t SensorService::enable(const sp<SensorEventConnection>& connection, samplingPeriodNs = minDelayNs; } - ALOGD_IF(DEBUG_CONNECTIONS, "Calling batch handle==%d flags=%d rate=%lld timeout== %lld", + ALOGD_IF(DEBUG_CONNECTIONS, "Calling batch handle==%d flags=%d rate=%" PRId64 " timeout== %" PRId64, handle, reservedFlags, samplingPeriodNs, maxBatchReportLatencyNs); status_t err = sensor->batch(connection.get(), handle, reservedFlags, samplingPeriodNs, |