diff options
Diffstat (limited to 'libsensors')
-rw-r--r-- | libsensors/AkmSensor.cpp | 6 | ||||
-rw-r--r-- | libsensors/GyroSensor.cpp | 2 | ||||
-rw-r--r-- | libsensors/LightSensor.cpp | 2 | ||||
-rw-r--r-- | libsensors/ProximitySensor.cpp | 2 | ||||
-rw-r--r-- | libsensors/SensorBase.cpp | 4 | ||||
-rw-r--r-- | libsensors/sensors.cpp | 10 |
6 files changed, 13 insertions, 13 deletions
diff --git a/libsensors/AkmSensor.cpp b/libsensors/AkmSensor.cpp index 34a24f2..ce28dbf 100644 --- a/libsensors/AkmSensor.cpp +++ b/libsensors/AkmSensor.cpp @@ -163,7 +163,7 @@ int AkmSensor::enable(int32_t handle, int en) else err = akm_disable_sensor(sensor_type); - LOGE_IF(err, "Could not change sensor state (%s)", strerror(-err)); + ALOGE_IF(err, "Could not change sensor state (%s)", strerror(-err)); if (!err) { mEnabled &= ~(1<<what); mEnabled |= (uint32_t(flags)<<what); @@ -200,7 +200,7 @@ int AkmSensor::loadAKMLibrary() akm_enable_sensor = stub_enable_disable_sensor; akm_disable_sensor = stub_enable_disable_sensor; akm_set_delay = stub_set_delay; - LOGE("AkmSensor: unable to load AKM Library, %s", dlerror()); + ALOGE("AkmSensor: unable to load AKM Library, %s", dlerror()); return -ENOENT; } @@ -246,7 +246,7 @@ int AkmSensor::readEvents(sensors_event_t* data, int count) mInputReader.next(); } } else { - LOGE("AkmSensor: unknown event (type=%d, code=%d)", + ALOGE("AkmSensor: unknown event (type=%d, code=%d)", type, event->code); mInputReader.next(); } diff --git a/libsensors/GyroSensor.cpp b/libsensors/GyroSensor.cpp index ecebb61..c54235d 100644 --- a/libsensors/GyroSensor.cpp +++ b/libsensors/GyroSensor.cpp @@ -164,7 +164,7 @@ again: count--; } } else { - LOGE("GyroSensor: unknown event (type=%d, code=%d)", + ALOGE("GyroSensor: unknown event (type=%d, code=%d)", type, event->code); } mInputReader.next(); diff --git a/libsensors/LightSensor.cpp b/libsensors/LightSensor.cpp index 5df7cd5..fe0b8b3 100644 --- a/libsensors/LightSensor.cpp +++ b/libsensors/LightSensor.cpp @@ -136,7 +136,7 @@ int LightSensor::readEvents(sensors_event_t* data, int count) numEventReceived++; } } else { - LOGE("LightSensor: unknown event (type=%d, code=%d)", + ALOGE("LightSensor: unknown event (type=%d, code=%d)", type, event->code); } mInputReader.next(); diff --git a/libsensors/ProximitySensor.cpp b/libsensors/ProximitySensor.cpp index 794a586..77a7f3c 100644 --- a/libsensors/ProximitySensor.cpp +++ b/libsensors/ProximitySensor.cpp @@ -129,7 +129,7 @@ int ProximitySensor::readEvents(sensors_event_t* data, int count) numEventReceived++; } } else { - LOGE("ProximitySensor: unknown event (type=%d, code=%d)", + ALOGE("ProximitySensor: unknown event (type=%d, code=%d)", type, event->code); } mInputReader.next(); diff --git a/libsensors/SensorBase.cpp b/libsensors/SensorBase.cpp index d448eb2..79b1ee2 100644 --- a/libsensors/SensorBase.cpp +++ b/libsensors/SensorBase.cpp @@ -53,7 +53,7 @@ SensorBase::~SensorBase() { int SensorBase::open_device() { if (dev_fd<0 && dev_name) { dev_fd = open(dev_name, O_RDONLY); - LOGE_IF(dev_fd<0, "Couldn't open %s (%s)", dev_name, strerror(errno)); + ALOGE_IF(dev_fd<0, "Couldn't open %s (%s)", dev_name, strerror(errno)); } return 0; } @@ -123,6 +123,6 @@ int SensorBase::openInput(const char* inputName) { } } closedir(dir); - LOGE_IF(fd<0, "couldn't find '%s' input device", inputName); + ALOGE_IF(fd<0, "couldn't find '%s' input device", inputName); return fd; } diff --git a/libsensors/sensors.cpp b/libsensors/sensors.cpp index 847f3ca..850cbf9 100644 --- a/libsensors/sensors.cpp +++ b/libsensors/sensors.cpp @@ -190,7 +190,7 @@ sensors_poll_context_t::sensors_poll_context_t() int wakeFds[2]; int result = pipe(wakeFds); - LOGE_IF(result<0, "error creating wake pipe (%s)", strerror(errno)); + ALOGE_IF(result<0, "error creating wake pipe (%s)", strerror(errno)); fcntl(wakeFds[0], F_SETFL, O_NONBLOCK); fcntl(wakeFds[1], F_SETFL, O_NONBLOCK); mWritePipeFd = wakeFds[1]; @@ -215,7 +215,7 @@ int sensors_poll_context_t::activate(int handle, int enabled) { if (enabled && !err) { const char wakeMessage(WAKE_MESSAGE); int result = write(mWritePipeFd, &wakeMessage, 1); - LOGE_IF(result<0, "error sending wake message (%s)", strerror(errno)); + ALOGE_IF(result<0, "error sending wake message (%s)", strerror(errno)); } return err; } @@ -256,14 +256,14 @@ int sensors_poll_context_t::pollEvents(sensors_event_t* data, int count) n = poll(mPollFds, numFds, nbEvents ? 0 : -1); } while (n < 0 && errno == EINTR); if (n<0) { - LOGE("poll() failed (%s)", strerror(errno)); + ALOGE("poll() failed (%s)", strerror(errno)); return -errno; } if (mPollFds[wake].revents & POLLIN) { char msg; int result = read(mPollFds[wake].fd, &msg, 1); - LOGE_IF(result<0, "error reading from wake pipe (%s)", strerror(errno)); - LOGE_IF(msg != WAKE_MESSAGE, "unknown message on wake queue (0x%02x)", int(msg)); + ALOGE_IF(result<0, "error reading from wake pipe (%s)", strerror(errno)); + ALOGE_IF(msg != WAKE_MESSAGE, "unknown message on wake queue (0x%02x)", int(msg)); mPollFds[wake].revents = 0; } } |