From 8b3fe9b3cff6b59b2f4977dcce9b3c1ae47c2e25 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Sun, 8 Jan 2012 10:17:54 +0000 Subject: [PATCH] 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: I9d2c4a1a9b0edda94f2eeacc1f4d270bf4d66804 --- loc_api/libloc_api-rpc/inc/debug.h | 4 ++-- loc_api/libloc_api/loc_eng_ni.cpp | 6 +++--- loc_api/libloc_api/loc_eng_xtra.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/loc_api/libloc_api-rpc/inc/debug.h b/loc_api/libloc_api-rpc/inc/debug.h index 4124c2a1..bef0ad39 100755 --- a/loc_api/libloc_api-rpc/inc/debug.h +++ b/loc_api/libloc_api-rpc/inc/debug.h @@ -43,14 +43,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #define E(x...) do { \ fprintf(stderr, "%s(%d) ", __FUNCTION__, __LINE__); \ fprintf(stderr, ##x); \ - LOGE(x); \ + ALOGE(x); \ } while(0) #define FAILIF(cond, msg...) do { \ if (__builtin_expect (cond, 0)) { \ fprintf(stderr, "%s:%s:(%d): ", __FILE__, __FUNCTION__, __LINE__); \ fprintf(stderr, ##msg); \ - LOGE(##msg); \ + ALOGE(##msg); \ } \ } while(0) diff --git a/loc_api/libloc_api/loc_eng_ni.cpp b/loc_api/libloc_api/loc_eng_ni.cpp index 003d63af..c7636831 100755 --- a/loc_api/libloc_api/loc_eng_ni.cpp +++ b/loc_api/libloc_api/loc_eng_ni.cpp @@ -402,7 +402,7 @@ static void loc_ni_request_handler(const char *msg, const rpc_loc_ni_event_s_typ break; default: - LOGE("loc_ni_request_handler, unknown request event: %d", ni_req->event); + ALOGE("loc_ni_request_handler, unknown request event: %d", ni_req->event); return; } @@ -508,7 +508,7 @@ int loc_eng_ni_callback ( break; default: - LOGE("Unknown NI event: %x\n", (int) ni_req->event); + ALOGE("Unknown NI event: %x\n", (int) ni_req->event); break; } } @@ -603,7 +603,7 @@ void loc_eng_ni_respond(int notif_id, GpsUserResponseType user_response) ALOGI("loc_eng_ni_respond: send user response %d for notif %d", user_response, notif_id); loc_ni_process_user_response(user_response); } else { - LOGE("loc_eng_ni_respond: notif_id %d mismatch or notification not in progress, response: %d", + ALOGE("loc_eng_ni_respond: notif_id %d mismatch or notification not in progress, response: %d", notif_id, user_response); } } diff --git a/loc_api/libloc_api/loc_eng_xtra.cpp b/loc_api/libloc_api/loc_eng_xtra.cpp index 1bef6caa..c713c270 100755 --- a/loc_api/libloc_api/loc_eng_xtra.cpp +++ b/loc_api/libloc_api/loc_eng_xtra.cpp @@ -159,7 +159,7 @@ static int qct_loc_eng_inject_xtra_data(char* data, int length) if (rpc_ret_val != RPC_LOC_API_SUCCESS) { - LOGE ("loc_ioctl for xtra returned %d \n", rpc_ret_val); + ALOGE ("loc_ioctl for xtra returned %d \n", rpc_ret_val); ret_val = EINVAL; // return error break; }