diff options
author | Tianjie Xu <xunchang@google.com> | 2016-09-02 01:14:58 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-02 01:14:58 +0200 |
commit | ec6a47ae461ecdc78141b457acba1537d913e1e7 (patch) | |
tree | c22d18bfe3e836f9187f893042e9bc50b329a062 /wear_touch.cpp | |
parent | Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 (diff) | |
parent | Merge "Switch recovery to libbase logging" (diff) | |
download | android_bootable_recovery-ec6a47ae461ecdc78141b457acba1537d913e1e7.tar android_bootable_recovery-ec6a47ae461ecdc78141b457acba1537d913e1e7.tar.gz android_bootable_recovery-ec6a47ae461ecdc78141b457acba1537d913e1e7.tar.bz2 android_bootable_recovery-ec6a47ae461ecdc78141b457acba1537d913e1e7.tar.lz android_bootable_recovery-ec6a47ae461ecdc78141b457acba1537d913e1e7.tar.xz android_bootable_recovery-ec6a47ae461ecdc78141b457acba1537d913e1e7.tar.zst android_bootable_recovery-ec6a47ae461ecdc78141b457acba1537d913e1e7.zip |
Diffstat (limited to '')
-rw-r--r-- | wear_touch.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/wear_touch.cpp b/wear_touch.cpp index 51a1d31b2..cf33daa9f 100644 --- a/wear_touch.cpp +++ b/wear_touch.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#include "common.h" -#include "wear_touch.h" - #include <dirent.h> #include <fcntl.h> #include <stdio.h> @@ -25,8 +22,11 @@ #include <errno.h> #include <string.h> +#include <android-base/logging.h> #include <linux/input.h> +#include "wear_touch.h" + #define DEVICE_PATH "/dev/input" WearSwipeDetector::WearSwipeDetector(int low, int high, OnSwipeCallback callback, void* cookie): @@ -49,11 +49,11 @@ void WearSwipeDetector::detect(int dx, int dy) { } else if (abs(dx) < mLowThreshold && abs(dy) > mHighThreshold) { direction = dy < 0 ? UP : DOWN; } else { - LOGD("Ignore %d %d\n", dx, dy); + LOG(DEBUG) << "Ignore " << dx << " " << dy; return; } - LOGD("Swipe direction=%d\n", direction); + LOG(DEBUG) << "Swipe direction=" << direction; mCallback(mCookie, direction); } @@ -105,7 +105,7 @@ void WearSwipeDetector::process(struct input_event *event) { void WearSwipeDetector::run() { int fd = findDevice(DEVICE_PATH); if (fd < 0) { - LOGE("no input devices found\n"); + LOG(ERROR) << "no input devices found"; return; } @@ -127,14 +127,14 @@ void* WearSwipeDetector::touch_thread(void* cookie) { int WearSwipeDetector::openDevice(const char *device) { int fd = open(device, O_RDONLY); if (fd < 0) { - LOGE("could not open %s, %s\n", device, strerror(errno)); + PLOG(ERROR) << "could not open " << device; return false; } char name[80]; name[sizeof(name) - 1] = '\0'; if (ioctl(fd, EVIOCGNAME(sizeof(name) - 1), &name) < 1) { - LOGE("could not get device name for %s, %s\n", device, strerror(errno)); + PLOG(ERROR) << "could not get device name for " << device; name[0] = '\0'; } @@ -143,7 +143,7 @@ int WearSwipeDetector::openDevice(const char *device) { int ret = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(bits)), bits); if (ret > 0) { if (test_bit(ABS_MT_POSITION_X, bits) && test_bit(ABS_MT_POSITION_Y, bits)) { - LOGD("Found %s %s\n", device, name); + LOG(DEBUG) << "Found " << device << " " << name; return fd; } } @@ -155,7 +155,7 @@ int WearSwipeDetector::openDevice(const char *device) { int WearSwipeDetector::findDevice(const char* path) { DIR* dir = opendir(path); if (dir == NULL) { - LOGE("Could not open directory %s", path); + PLOG(ERROR) << "Could not open directory " << path; return false; } |