libsecril-client: Use RLOG
The radio log prints use-Rlog/RLOG-RILClient as the prefix, so we should
use RLOG and not ALOG.
Change-Id: I5c217cca9510948871b4157f69361c869dea2a01
diff --git a/ril/libsecril-client/secril-client.cpp b/ril/libsecril-client/secril-client.cpp
index 5cfea70..a5dbce5 100755
--- a/ril/libsecril-client/secril-client.cpp
+++ b/ril/libsecril-client/secril-client.cpp
@@ -355,7 +355,7 @@
RilClientPrv *client_prv;
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
@@ -366,7 +366,7 @@
client_prv->sock = socket_local_client(MULTI_CLIENT_SOCKET_NAME, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM );
if (client_prv->sock < 0) {
- ALOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -381,7 +381,7 @@
if (pipe(client_prv->pipefd) < 0) {
close(client_prv->sock);
- ALOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_IO;
}
@@ -400,7 +400,7 @@
memset(client_prv, 0, sizeof(RilClientPrv));
client_prv->sock = -1;
- ALOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -419,7 +419,7 @@
RilClientPrv *client_prv;
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
@@ -430,7 +430,7 @@
client_prv->sock = socket_local_client(MULTI_CLIENT_Q_SOCKET_NAME, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM );
if (client_prv->sock < 0) {
- ALOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -445,7 +445,7 @@
if (pipe(client_prv->pipefd) < 0) {
close(client_prv->sock);
- ALOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_IO;
}
@@ -464,7 +464,7 @@
memset(client_prv, 0, sizeof(RilClientPrv));
client_prv->sock = -1;
- ALOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -484,7 +484,7 @@
RilClientPrv *client_prv;
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
@@ -495,7 +495,7 @@
client_prv->sock = socket_local_client(MULTI_CLIENT_SOCKET_NAME_2, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM );
if (client_prv->sock < 0) {
- ALOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -510,7 +510,7 @@
if (pipe(client_prv->pipefd) < 0) {
close(client_prv->sock);
- ALOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_IO;
}
@@ -529,7 +529,7 @@
memset(client_prv, 0, sizeof(RilClientPrv));
client_prv->sock = -1;
- ALOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno);
+ RLOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -549,7 +549,7 @@
RilClientPrv *client_prv;
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
@@ -571,7 +571,7 @@
int ret = 0;
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
@@ -606,7 +606,7 @@
extern "C"
int CloseClient_RILD(HRilClient client) {
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
@@ -629,19 +629,19 @@
char data[6] = {0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
if (isValidSoundType(type) == false) {
- ALOGE("%s: Invalid sound type", __FUNCTION__);
+ RLOGE("%s: Invalid sound type", __FUNCTION__);
return RIL_CLIENT_ERR_INVAL;
}
@@ -679,19 +679,19 @@
char data[6] = {0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
if (isValidAudioPath(path) == false) {
- ALOGE("%s: Invalid audio path", __FUNCTION__);
+ RLOGE("%s: Invalid audio path", __FUNCTION__);
return RIL_CLIENT_ERR_INVAL;
}
@@ -726,19 +726,19 @@
char data[5] = {0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
if (isValidSoundClockCondition(condition) == false) {
- ALOGE("%s: Invalid sound clock condition", __FUNCTION__);
+ RLOGE("%s: Invalid sound clock condition", __FUNCTION__);
return RIL_CLIENT_ERR_INVAL;
}
@@ -769,19 +769,19 @@
char data[5] = {0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
if (isValidSoundClockCondition(condition) == false) {
- ALOGE("%s: Invalid sound clock condition", __FUNCTION__);
+ RLOGE("%s: Invalid sound clock condition", __FUNCTION__);
return RIL_CLIENT_ERR_INVAL;
}
@@ -812,19 +812,19 @@
char data[5] = {0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
if (isValidCallRecCondition(condition) == false) {
- ALOGE("%s: Invalid sound clock condition", __FUNCTION__);
+ RLOGE("%s: Invalid sound clock condition", __FUNCTION__);
return RIL_CLIENT_ERR_INVAL;
}
@@ -855,19 +855,19 @@
char data[5] = {0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
if (isValidMuteCondition(condition) == false) {
- ALOGE("%s: Invalid sound clock condition", __FUNCTION__);
+ RLOGE("%s: Invalid sound clock condition", __FUNCTION__);
return RIL_CLIENT_ERR_INVAL;
}
@@ -898,14 +898,14 @@
char data[4] = {0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -933,22 +933,22 @@
int ret;
char data[6] = {0,};
- ALOGE(" + %s", __FUNCTION__);
+ RLOGE(" + %s", __FUNCTION__);
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
if (isValidTwoMicCtrl(device, report) == false) {
- ALOGE("%s: Invalid sound set two params", __FUNCTION__);
+ RLOGE("%s: Invalid sound set two params", __FUNCTION__);
return RIL_CLIENT_ERR_INVAL;
}
@@ -967,7 +967,7 @@
RegisterRequestCompleteHandler(client, REQ_SET_TWO_MIC_CTRL, NULL);
}
- ALOGE(" - %s", __FUNCTION__);
+ RLOGE(" - %s", __FUNCTION__);
return ret;
}
@@ -980,18 +980,18 @@
char tempPara[24]={0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
- ALOGE("%s: DHA mode=%d, select=%d", __FUNCTION__,mode, select);
+ RLOGE("%s: DHA mode=%d, select=%d", __FUNCTION__,mode, select);
// Make raw data
data[0] = OEM_FUNC_SOUND;
@@ -1025,14 +1025,14 @@
char data[6] = {0,};
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -1070,14 +1070,14 @@
RilClientPrv *client_prv;
if (client == NULL || client->prv == NULL) {
- ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+ RLOGE("%s: Invalid client %p", __FUNCTION__, client);
return RIL_CLIENT_ERR_INVAL;
}
client_prv = (RilClientPrv *)(client->prv);
if (client_prv->sock < 0 ) {
- ALOGE("%s: Not connected.", __FUNCTION__);
+ RLOGE("%s: Not connected.", __FUNCTION__);
return RIL_CLIENT_ERR_CONNECT;
}
@@ -1098,7 +1098,7 @@
// Allocate a token.
token = AllocateToken(&(client_prv->token_pool));
if (token == 0) {
- ALOGE("%s: No token.", __FUNCTION__);
+ RLOGE("%s: No token.", __FUNCTION__);
return RIL_CLIENT_ERR_AGAIN;
}
@@ -1116,18 +1116,18 @@
// DO TX: header(size).
header = htonl(p.dataSize());
- if (DBG) ALOGD("%s(): token = %d\n", __FUNCTION__, token);
+ if (DBG) RLOGD("%s(): token = %d\n", __FUNCTION__, token);
ret = blockingWrite(client_prv->sock, (void *)&header, sizeof(header));
if (ret < 0) {
- ALOGE("%s: send request header failed. (%d)", __FUNCTION__, ret);
+ RLOGE("%s: send request header failed. (%d)", __FUNCTION__, ret);
goto error;
}
// Do TX: response data.
ret = blockingWrite(client_prv->sock, p.data(), p.dataSize());
if (ret < 0) {
- ALOGE("%s: send request data failed. (%d)", __FUNCTION__, ret);
+ RLOGE("%s: send request data failed. (%d)", __FUNCTION__, ret);
goto error;
}
@@ -1236,7 +1236,7 @@
FD_SET(client_prv->sock, &(client_prv->sock_rfds));
FD_SET(client_prv->pipefd[0], &(client_prv->sock_rfds));
- if (DBG) ALOGD("[*] %s() b_connect=%d\n", __FUNCTION__, client_prv->b_connect);
+ if (DBG) RLOGD("[*] %s() b_connect=%d\n", __FUNCTION__, client_prv->b_connect);
if (select(maxfd, &(client_prv->sock_rfds), NULL, NULL, NULL) > 0) {
if (FD_ISSET(client_prv->sock, &(client_prv->sock_rfds))) {
// Read incoming data
@@ -1252,7 +1252,7 @@
else if (ret == 0) { // && p_record != NULL
n = processRxBuffer(client_prv, p_record, recordlen);
if (n != RIL_CLIENT_ERR_SUCCESS) {
- ALOGE("%s: processRXBuffer returns %d", __FUNCTION__, n);
+ RLOGE("%s: processRXBuffer returns %d", __FUNCTION__, n);
}
}
else {
@@ -1283,7 +1283,7 @@
if (FD_ISSET(client_prv->pipefd[0], &(client_prv->sock_rfds))) {
char end_cmd[10];
- if (DBG) ALOGD("%s(): close\n", __FUNCTION__);
+ if (DBG) RLOGD("%s(): close\n", __FUNCTION__);
if (read(client_prv->pipefd[0], end_cmd, sizeof(end_cmd)) > 0) {
close(client_prv->sock);
@@ -1309,17 +1309,17 @@
status = p.readInt32(&resp_id);
if (status != NO_ERROR) {
- ALOGE("%s: read resp_id failed.", __FUNCTION__);
+ RLOGE("%s: read resp_id failed.", __FUNCTION__);
return RIL_CLIENT_ERR_IO;
}
status = p.readInt32(&len);
if (status != NO_ERROR) {
- //ALOGE("%s: read length failed. assume zero length.", __FUNCTION__);
+ //RLOGE("%s: read length failed. assume zero length.", __FUNCTION__);
len = 0;
}
- ALOGD("%s(): resp_id (%d), len(%d)\n", __FUNCTION__, resp_id, len);
+ RLOGD("%s(): resp_id (%d), len(%d)\n", __FUNCTION__, resp_id, len);
if (len)
data = p.readInplace(len);
@@ -1342,29 +1342,29 @@
int ret = RIL_CLIENT_ERR_SUCCESS;
uint32_t req_id = 0;
- if (DBG) ALOGD("%s()", __FUNCTION__);
+ if (DBG) RLOGD("%s()", __FUNCTION__);
status = p.readInt32(&token);
if (status != NO_ERROR) {
- ALOGE("%s: Read token fail. Status %d\n", __FUNCTION__, status);
+ RLOGE("%s: Read token fail. Status %d\n", __FUNCTION__, status);
return RIL_CLIENT_ERR_IO;
}
if (IsValidToken(&(prv->token_pool), token) == 0) {
- ALOGE("%s: Invalid Token", __FUNCTION__);
+ RLOGE("%s: Invalid Token", __FUNCTION__);
return RIL_CLIENT_ERR_INVAL; // Invalid token.
}
status = p.readInt32(&err);
if (status != NO_ERROR) {
- ALOGE("%s: Read err fail. Status %d\n", __FUNCTION__, status);
+ RLOGE("%s: Read err fail. Status %d\n", __FUNCTION__, status);
ret = RIL_CLIENT_ERR_IO;
goto error;
}
// Don't go further for error response.
if (err != RIL_CLIENT_ERR_SUCCESS) {
- ALOGE("%s: Error %d\n", __FUNCTION__, err);
+ RLOGE("%s: Error %d\n", __FUNCTION__, err);
if (prv->err_cb)
prv->err_cb(prv->err_cb_data, err);
ret = RIL_CLIENT_ERR_SUCCESS;
@@ -1387,7 +1387,7 @@
req_func = FindReqHandler(prv, token, &req_id);
if (req_func)
{
- if (DBG) ALOGD("[*] Call handler");
+ if (DBG) RLOGD("[*] Call handler");
req_func(prv->parent, data, len);
if(prv->b_del_handler) {
@@ -1395,7 +1395,7 @@
RegisterRequestCompleteHandler(prv->parent, req_id, NULL);
}
} else {
- if (DBG) ALOGD("%s: No handler for token %d\n", __FUNCTION__, token);
+ if (DBG) RLOGD("%s: No handler for token %d\n", __FUNCTION__, token);
}
error:
@@ -1416,7 +1416,7 @@
p.setData((uint8_t *)buffer, buflen);
status = p.readInt32(&response_type);
- if (DBG) ALOGD("%s: status %d response_type %d", __FUNCTION__, status, response_type);
+ if (DBG) RLOGD("%s: status %d response_type %d", __FUNCTION__, status, response_type);
if (status != NO_ERROR) {
ret = RIL_CLIENT_ERR_IO;
@@ -1483,19 +1483,19 @@
static int RecordReqHistory(RilClientPrv *prv, int token, uint32_t id) {
int i = 0;
- if (DBG) ALOGD("[*] %s(): token(%d), ID(%d)\n", __FUNCTION__, token, id);
+ if (DBG) RLOGD("[*] %s(): token(%d), ID(%d)\n", __FUNCTION__, token, id);
for (i = 0; i < TOKEN_POOL_SIZE; i++) {
if (prv->history[i].token == 0) {
prv->history[i].token = token;
prv->history[i].id = id;
- if (DBG) ALOGD("[*] %s(): token(%d), ID(%d)\n", __FUNCTION__, token, id);
+ if (DBG) RLOGD("[*] %s(): token(%d), ID(%d)\n", __FUNCTION__, token, id);
return RIL_CLIENT_ERR_SUCCESS;
}
}
- ALOGE("%s: No free record for token %d", __FUNCTION__, token);
+ RLOGE("%s: No free record for token %d", __FUNCTION__, token);
return RIL_CLIENT_ERR_RESOURCE;
}
@@ -1503,7 +1503,7 @@
static void ClearReqHistory(RilClientPrv *prv, int token) {
int i = 0;
- if (DBG) ALOGD("[*] %s(): token(%d)\n", __FUNCTION__, token);
+ if (DBG) RLOGD("[*] %s(): token(%d)\n", __FUNCTION__, token);
for (i = 0; i < TOKEN_POOL_SIZE; i++) {
if (prv->history[i].token == token) {
memset(&(prv->history[i]), 0, sizeof(ReqHistory));
@@ -1530,7 +1530,7 @@
int i = 0;
int j = 0;
- if (DBG) ALOGD("[*] %s(): token(%d)\n", __FUNCTION__, token);
+ if (DBG) RLOGD("[*] %s(): token(%d)\n", __FUNCTION__, token);
// Search request history.
for (i = 0; i < TOKEN_POOL_SIZE; i++) {
@@ -1576,7 +1576,7 @@
writeOffset += written;
}
else {
- ALOGE ("RIL Response: unexpected error on write errno:%d", errno);
+ RLOGE ("RIL Response: unexpected error on write errno:%d", errno);
printf("RIL Response: unexpected error on write errno:%d\n", errno);
close(fd);
return -1;