diff options
Diffstat (limited to 'mock-ril/src/cpp/requests.cpp')
-rw-r--r-- | mock-ril/src/cpp/requests.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/mock-ril/src/cpp/requests.cpp b/mock-ril/src/cpp/requests.cpp index 366ba30..72cbd00 100644 --- a/mock-ril/src/cpp/requests.cpp +++ b/mock-ril/src/cpp/requests.cpp @@ -38,7 +38,7 @@ //#define REQUESTS_DEBUG #ifdef REQUESTS_DEBUG -#define DBG(...) LOGD(__VA_ARGS__) +#define DBG(...) ALOGD(__VA_ARGS__) #else @@ -73,7 +73,7 @@ int ReqEnterSimPin(Buffer **pBuffer, DBG("ReqEnterSimPin E"); if (datalen < sizeof(int)) { - LOGE("ReqEnterSimPin: data to small err size < sizeof int"); + ALOGE("ReqEnterSimPin: data to small err size < sizeof int"); status = STATUS_BAD_DATA; } else { ril_proto::ReqEnterSimPin *req = new ril_proto::ReqEnterSimPin(); @@ -101,7 +101,7 @@ int ReqDial(Buffer **pBuffer, DBG("data=%p datalen=%d t=%p", data, datalen, t); if (datalen < sizeof(int)) { - LOGE("ReqDial: data to small err size < sizeof int"); + ALOGE("ReqDial: data to small err size < sizeof int"); status = STATUS_BAD_DATA; } else { ril_proto::ReqDial *req = new ril_proto::ReqDial(); @@ -158,7 +158,7 @@ int ReqHangUp(Buffer **pBuffer, DBG("ReqHangUp E"); if (datalen < sizeof(int)) { - LOGE("ReqHangUp: data to small err size < sizeof int"); + ALOGE("ReqHangUp: data to small err size < sizeof int"); status = STATUS_BAD_DATA; } else { ril_proto::ReqHangUp *req = new ril_proto::ReqHangUp(); @@ -185,7 +185,7 @@ int ReqSeparateConnection (Buffer **pBuffer, DBG("ReqSeparateConnection E"); if (datalen < sizeof(int)) { - LOGE("ReqSetMute: data to small err size < sizeof int"); + ALOGE("ReqSetMute: data to small err size < sizeof int"); status = STATUS_BAD_DATA; } else { ril_proto::ReqSeparateConnection *req = new ril_proto::ReqSeparateConnection(); @@ -213,7 +213,7 @@ int ReqSetMute(Buffer **pBuffer, DBG("ReqSetMute E"); if (datalen < sizeof(int)) { - LOGE("ReqSetMute: data to small err size < sizeof int"); + ALOGE("ReqSetMute: data to small err size < sizeof int"); status = STATUS_BAD_DATA; } else { ril_proto::ReqSetMute *req = new ril_proto::ReqSetMute(); @@ -242,7 +242,7 @@ int ReqScreenState(Buffer **pBuffer, DBG("ReqScreenState E data=%p datalen=%d t=%p", data, datalen, t); if (datalen < sizeof(int)) { - LOGE("ReqScreenState: data to small err size < sizeof int"); + ALOGE("ReqScreenState: data to small err size < sizeof int"); status = STATUS_BAD_DATA; } else { ril_proto::ReqScreenState *req = new ril_proto::ReqScreenState(); @@ -293,7 +293,7 @@ int callOnRilRequest(v8::Handle<v8::Context> context, int cmd, v8::Handle<v8::Value> result = onRilRequestFunction->Call(context->Global(), argc, argv); if (try_catch.HasCaught()) { - LOGE("callOnRilRequest error"); + ALOGE("callOnRilRequest error"); ReportException(&try_catch); status = STATUS_ERR; } else { @@ -350,7 +350,7 @@ void RilRequestWorkerQueue::AddRequest (const int request, if (itr != rilReqConversionMap.end()) { status = itr->second(&buffer, data, datalen, token); } else { - LOGE("RilRequestWorkerQueue:AddRequest: X unknown request %d", request); + ALOGE("RilRequestWorkerQueue:AddRequest: X unknown request %d", request); status = STATUS_UNSUPPORTED_REQUEST; } @@ -403,7 +403,7 @@ void RilRequestWorkerQueue::Process(void *p) { } int requestsInit(v8::Handle<v8::Context> context, RilRequestWorkerQueue **rwq) { - LOGD("requestsInit E"); + ALOGD("requestsInit E"); rilReqConversionMap[RIL_REQUEST_GET_SIM_STATUS] = ReqWithNoData; // 1 rilReqConversionMap[RIL_REQUEST_ENTER_SIM_PIN] = ReqEnterSimPin; // 2 @@ -433,7 +433,7 @@ int requestsInit(v8::Handle<v8::Context> context, RilRequestWorkerQueue **rwq) { *rwq = new RilRequestWorkerQueue(context); int status = (*rwq)->Run(); - LOGD("requestsInit X: status=%d", status); + ALOGD("requestsInit X: status=%d", status); return status; } @@ -446,24 +446,24 @@ void testRilRequest(v8::Handle<v8::Context> context, int request, const void *da ReqConversionMap::iterator itr; int status; - LOGD("testRilRequest: request=%d", request); + ALOGD("testRilRequest: request=%d", request); itr = rilReqConversionMap.find(request); if (itr != rilReqConversionMap.end()) { status = itr->second(&buffer, data, sizeof(data), (void *)0x12345677); } else { - LOGE("testRequests X unknown request %d", request); + ALOGE("testRequests X unknown request %d", request); status = STATUS_UNSUPPORTED_REQUEST; } if (status == STATUS_OK) { callOnRilRequest(context, request, buffer, (void *)0x12345677); } else { - LOGE("testRilRequest X, serialize error"); + ALOGE("testRilRequest X, serialize error"); } } void testRequests(v8::Handle<v8::Context> context) { - LOGD("testRequests E: ********"); + ALOGD("testRequests E: ********"); v8::TryCatch try_catch; @@ -521,5 +521,5 @@ void testRequests(v8::Handle<v8::Context> context) { } } - LOGD("testRequests X: ********\n"); + ALOGD("testRequests X: ********\n"); } |