replace logx with alogx

Conflicts:

	btif/src/btif_core.c
	btif/src/btif_dm.c
	btif/src/btif_hh.c
	btif/src/btif_sock.c
	gki/ulinux/gki_ulinux.c
	hci/include/bt_hci_bdroid.h
	hci/src/bt_hci_bdroid.c
	hci/src/btsnoop.c
	hci/src/hci_h4.c
	hci/src/userial.c
	vendor/libvendor/src/hardware.c
	vendor/libvendor/src/upio.c

2 files changed, 4 insertions, 4 deletions

diff --git a/btif/include/btif_common.h b/btif/include/btif_common.h
index 5613004..8e5c275 100644
--- a/btif/include/btif_common.h
+++ b/btif/include/btif_common.h
@@ -70,7 +70,7 @@
 **  Constants & Macros
 ************************************************************************************/
 
-#define ASSERTC(cond, msg, val) if (!(cond)) {LOGE("### ASSERT : %s line %d %s (%d) ###", __FILE__, __LINE__, msg, val);}
+#define ASSERTC(cond, msg, val) if (!(cond)) {ALOGE("### ASSERT : %s line %d %s (%d) ###", __FILE__, __LINE__, msg, val);}
 
 /* Calculate start of event enumeration; id is top 8 bits of event */
 #define BTIF_SIG_START(id)       ((id) << 8)
@@ -90,7 +90,7 @@ extern bt_callbacks_t *bt_hal_cbacks;
 
 #define HAL_CBACK(P_CB, P_CBACK, ...)\
     if (P_CB && P_CB->P_CBACK) {            \
-        LOGD("HAL %s->%s", #P_CB, #P_CBACK); \
+        ALOGD("HAL %s->%s", #P_CB, #P_CBACK); \
         P_CB->P_CBACK(__VA_ARGS__);         \
     }                                       \
     else {                                  \
diff --git a/btif/include/btif_sock_util.h b/btif/include/btif_sock_util.h
index b76bb6f..7a7cff3 100644
--- a/btif/include/btif_sock_util.h
+++ b/btif/include/btif_sock_util.h
@@ -70,13 +70,13 @@ static inline void lock_slot(pthread_mutex_t* mutex)
 {
     if(mutex->value)
         pthread_mutex_lock(mutex);
-    else LOGE("mutex: %p is not initialized", mutex);
+    else ALOGE("mutex: %p is not initialized", mutex);
 }
 static inline void unlock_slot(pthread_mutex_t* mutex)
 {
    if(mutex->value)
         pthread_mutex_unlock(mutex);
-   else LOGE("mutex: %p is not initialized", mutex);
+   else ALOGE("mutex: %p is not initialized", mutex);
 }
 void dump_bin(const char* title, const char* data, int size);
 int sock_send_fd(int sock_fd, const uint8_t* buffer, int len, int send_fd);