aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-04 10:14:22 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-04 10:14:22 -0800
commit749ae07c47843193a623d6633e96cd1168d1633c (patch)
tree45805afc385c2647efe3276626f2700467e79f60
parent126c35356a2864970dc1d68b4615b4a378ed27e0 (diff)
parent403ded01593c108fa6133685eb362b304cde987f (diff)
downloadsdk-749ae07c47843193a623d6633e96cd1168d1633c.zip
sdk-749ae07c47843193a623d6633e96cd1168d1633c.tar.gz
sdk-749ae07c47843193a623d6633e96cd1168d1633c.tar.bz2
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
-rw-r--r--emulator/gps/gps_qemu.c2
-rw-r--r--emulator/qemud/qemud.c2
-rw-r--r--emulator/sensors/sensors_qemu.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/emulator/gps/gps_qemu.c b/emulator/gps/gps_qemu.c
index a4699d3..49bfb0b 100644
--- a/emulator/gps/gps_qemu.c
+++ b/emulator/gps/gps_qemu.c
@@ -42,7 +42,7 @@
#define GPS_DEBUG 0
#if GPS_DEBUG
-# define D(...) LOGD(__VA_ARGS__)
+# define D(...) ALOGD(__VA_ARGS__)
#else
# define D(...) ((void)0)
#endif
diff --git a/emulator/qemud/qemud.c b/emulator/qemud/qemud.c
index dc04de8..e836376 100644
--- a/emulator/qemud/qemud.c
+++ b/emulator/qemud/qemud.c
@@ -87,7 +87,7 @@
#if DEBUG
# define LOG_TAG "qemud"
# include <cutils/log.h>
-# define D(...) LOGD(__VA_ARGS__)
+# define D(...) ALOGD(__VA_ARGS__)
#else
# define D(...) ((void)0)
# define T(...) ((void)0)
diff --git a/emulator/sensors/sensors_qemu.c b/emulator/sensors/sensors_qemu.c
index ff83bf8..b611f9a 100644
--- a/emulator/sensors/sensors_qemu.c
+++ b/emulator/sensors/sensors_qemu.c
@@ -39,7 +39,7 @@
#include <hardware/sensors.h>
#if 0
-#define D(...) LOGD(__VA_ARGS__)
+#define D(...) ALOGD(__VA_ARGS__)
#else
#define D(...) ((void)0)
#endif
@@ -402,7 +402,7 @@ data__close(struct hw_device_t *dev)
SensorPoll* data = (SensorPoll*)dev;
if (data) {
if (data->events_fd >= 0) {
- //LOGD("(device close) about to close fd=%d", data->events_fd);
+ //ALOGD("(device close) about to close fd=%d", data->events_fd);
close(data->events_fd);
}
free(data);