diff options
| author | Steve Block <steveblock@google.com> | 2012-01-06 19:16:12 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-08 11:03:26 +0000 |
| commit | 08c8c67926b446b2b89a1565a493b17dada8f75d (patch) | |
| tree | 63f9c191b21ffa253b50fbe66170b13112306453 | |
| parent | e379eecc3342d19cec116cafe8875b50539dc845 (diff) | |
| download | sdk-08c8c67926b446b2b89a1565a493b17dada8f75d.zip sdk-08c8c67926b446b2b89a1565a493b17dada8f75d.tar.gz sdk-08c8c67926b446b2b89a1565a493b17dada8f75d.tar.bz2 | |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: I3543198b483c91a3bf7c3f17e174969af3dfb8c5
| -rw-r--r-- | emulator/gps/gps_qemu.c | 12 | ||||
| -rw-r--r-- | emulator/sensors/sensors_qemu.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/emulator/gps/gps_qemu.c b/emulator/gps/gps_qemu.c index 49bfb0b..78e0bf2 100644 --- a/emulator/gps/gps_qemu.c +++ b/emulator/gps/gps_qemu.c @@ -686,13 +686,13 @@ gps_state_thread( void* arg ) nevents = epoll_wait( epoll_fd, events, 2, -1 ); if (nevents < 0) { if (errno != EINTR) - LOGE("epoll_wait() unexpected error: %s", strerror(errno)); + ALOGE("epoll_wait() unexpected error: %s", strerror(errno)); continue; } D("gps thread received %d events", nevents); for (ne = 0; ne < nevents; ne++) { if ((events[ne].events & (EPOLLERR|EPOLLHUP)) != 0) { - LOGE("EPOLLERR or EPOLLHUP after epoll_wait() !?"); + ALOGE("EPOLLERR or EPOLLHUP after epoll_wait() !?"); return; } if ((events[ne].events & EPOLLIN) != 0) { @@ -738,7 +738,7 @@ gps_state_thread( void* arg ) if (errno == EINTR) continue; if (errno != EWOULDBLOCK) - LOGE("error while reading from gps daemon socket: %s:", strerror(errno)); + ALOGE("error while reading from gps daemon socket: %s:", strerror(errno)); break; } D("received %d bytes: %.*s", ret, ret, buff); @@ -749,7 +749,7 @@ gps_state_thread( void* arg ) } else { - LOGE("epoll_wait() returned unkown fd %d ?", fd); + ALOGE("epoll_wait() returned unkown fd %d ?", fd); } } } @@ -775,14 +775,14 @@ gps_state_init( GpsState* state, GpsCallbacks* callbacks ) D("gps emulation will read from '%s' qemud channel", QEMU_CHANNEL_NAME ); if ( socketpair( AF_LOCAL, SOCK_STREAM, 0, state->control ) < 0 ) { - LOGE("could not create thread control socket pair: %s", strerror(errno)); + ALOGE("could not create thread control socket pair: %s", strerror(errno)); goto Fail; } state->thread = callbacks->create_thread_cb( "gps_state_thread", gps_state_thread, state ); if ( !state->thread ) { - LOGE("could not create gps thread: %s", strerror(errno)); + ALOGE("could not create gps thread: %s", strerror(errno)); goto Fail; } diff --git a/emulator/sensors/sensors_qemu.c b/emulator/sensors/sensors_qemu.c index b611f9a..156ee58 100644 --- a/emulator/sensors/sensors_qemu.c +++ b/emulator/sensors/sensors_qemu.c @@ -44,7 +44,7 @@ #define D(...) ((void)0) #endif -#define E(...) LOGE(__VA_ARGS__) +#define E(...) ALOGE(__VA_ARGS__) #include <hardware/qemud.h> @@ -281,7 +281,7 @@ pick_sensor(SensorPoll* data, return i; } } - LOGE("No sensor to return!!! pendingSensors=%08x", data->pendingSensors); + ALOGE("No sensor to return!!! pendingSensors=%08x", data->pendingSensors); // we may end-up in a busy loop, slow things down, just in case. usleep(100000); return -EINVAL; |
