summaryrefslogtreecommitdiffstats
path: root/services/sensorservice/SensorService.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-12-20 16:23:08 +0000
committerMathias Agopian <mathias@google.com>2012-06-27 17:07:56 -0700
commita551237de142549fb8a6608ee9d2fbf4b7ca2ebf (patch)
treec79cd11ec1d38c033613bef92f96e3c8e2bcf767 /services/sensorservice/SensorService.cpp
parent1a62301fc58cd2af18239b0415813461bf5fc41b (diff)
downloadframeworks_native-a551237de142549fb8a6608ee9d2fbf4b7ca2ebf.zip
frameworks_native-a551237de142549fb8a6608ee9d2fbf4b7ca2ebf.tar.gz
frameworks_native-a551237de142549fb8a6608ee9d2fbf4b7ca2ebf.tar.bz2
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
Diffstat (limited to 'services/sensorservice/SensorService.cpp')
-rw-r--r--services/sensorservice/SensorService.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index f61a11a..3e4a2f5 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -65,7 +65,7 @@ SensorService::SensorService()
void SensorService::onFirstRef()
{
- LOGD("nuSensorService starting...");
+ ALOGD("nuSensorService starting...");
SensorDevice& dev(SensorDevice::getInstance());
@@ -222,7 +222,7 @@ status_t SensorService::dump(int fd, const Vector<String16>& args)
bool SensorService::threadLoop()
{
- LOGD("nuSensorService thread starting...");
+ ALOGD("nuSensorService thread starting...");
const size_t numEventMax = 16 * (1 + mVirtualSensorList.size());
sensors_event_t buffer[numEventMax];
@@ -363,11 +363,11 @@ void SensorService::cleanupConnection(SensorEventConnection* c)
Mutex::Autolock _l(mLock);
const wp<SensorEventConnection> connection(c);
size_t size = mActiveSensors.size();
- LOGD_IF(DEBUG_CONNECTIONS, "%d active sensors", size);
+ ALOGD_IF(DEBUG_CONNECTIONS, "%d active sensors", size);
for (size_t i=0 ; i<size ; ) {
int handle = mActiveSensors.keyAt(i);
if (c->hasSensor(handle)) {
- LOGD_IF(DEBUG_CONNECTIONS, "%i: disabling handle=0x%08x", i, handle);
+ ALOGD_IF(DEBUG_CONNECTIONS, "%i: disabling handle=0x%08x", i, handle);
SensorInterface* sensor = mSensorMap.valueFor( handle );
LOGE_IF(!sensor, "mSensorMap[handle=0x%08x] is null!", handle);
if (sensor) {
@@ -376,12 +376,12 @@ void SensorService::cleanupConnection(SensorEventConnection* c)
}
SensorRecord* rec = mActiveSensors.valueAt(i);
LOGE_IF(!rec, "mActiveSensors[%d] is null (handle=0x%08x)!", i, handle);
- LOGD_IF(DEBUG_CONNECTIONS,
+ ALOGD_IF(DEBUG_CONNECTIONS,
"removing connection %p for sensor[%d].handle=0x%08x",
c, i, handle);
if (rec && rec->removeConnection(connection)) {
- LOGD_IF(DEBUG_CONNECTIONS, "... and it was the last connection");
+ ALOGD_IF(DEBUG_CONNECTIONS, "... and it was the last connection");
mActiveSensors.removeItemsAt(i, 1);
mActiveVirtualSensors.removeItem(handle);
delete rec;
@@ -528,7 +528,7 @@ SensorService::SensorEventConnection::SensorEventConnection(
SensorService::SensorEventConnection::~SensorEventConnection()
{
- LOGD_IF(DEBUG_CONNECTIONS, "~SensorEventConnection(%p)", this);
+ ALOGD_IF(DEBUG_CONNECTIONS, "~SensorEventConnection(%p)", this);
mService->cleanupConnection(this);
}