[feature]:
1.add sms service
[fix]:
1.delete printf
Change-Id: Iaacd7aa743c2f0c64a359f4c95cd6e3de2686f0d
diff --git a/framework/lynq-ril-service/src/ril.cpp b/framework/lynq-ril-service/src/ril.cpp
index 0bf1c6e..612d680 100755
--- a/framework/lynq-ril-service/src/ril.cpp
+++ b/framework/lynq-ril-service/src/ril.cpp
@@ -73,6 +73,8 @@
/*Warren add for t800 RIL service 2021_12_10 start*/
#include <sys/epoll.h>
#include "lynq_interface.h"
+#include "lynq_common.h"
+#include "lynq_sms_manager.h"
/*Warren add for t800 RIL service 2021_12_10 end*/
#define LOG_TAG "DEMO_RIL"
@@ -4261,6 +4263,8 @@
int64_t timeReceived = 0;
bool shouldScheduleTimeout = false;
RIL_RadioState newState;
+ int temp = 0;
+ char *tempChar=NULL;
RIL_SOCKET_ID soc_id = (RIL_SOCKET_ID)Phone_utils::get_enable_sim_for_dsss();
#if defined(ANDROID_MULTI_SIM)
@@ -4330,7 +4334,6 @@
appendPrintBuf("[UNSL][SIM%d]< %s", soc_id, requestToString(unsolResponse));
Parcel p;
-
p.writeInt32 (RESPONSE_UNSOLICITED);
p.writeInt32 (unsolResponse);
/*Warren add for t800 ril service 2021/12/16 start*/
@@ -4376,10 +4379,7 @@
#if VDBG
RLOGI("%s UNSOLICITED: %s length:%d", rilSocketIdToString(soc_id), requestToString(unsolResponse), p.dataSize());
#endif
- /*Warren add for t800 ril service 2021/12/16 start*/
- ret = LYNQ_RIL_urcBroadcast(p);
- /*Warren add for t800 ril service 2021/12/16 end*/
- ret = sendResponse(p, soc_id);
+ //ret = sendResponse(p, soc_id);
//unsol trigger other things.
switch(unsolResponse) {
@@ -4396,7 +4396,7 @@
getVoiceAndDataRegistrationState(soc_id);
break;
case RIL_UNSOL_RESPONSE_NEW_SMS:
- responseNewSMS((const char*)data, datalen,soc_id);
+ responseNewSMS((const char*)data, datalen,soc_id,unsolResponse,p);
unreadStatusWriteSMSToSim((const char*)data, datalen, soc_id);
sendSMSACK(soc_id);
break;
@@ -4530,6 +4530,9 @@
default:
break;
}
+ /*Warren add for t800 ril service 2021/12/16 start*/
+ ret = LYNQ_RIL_urcBroadcast(p);
+ /*Warren add for t800 ril service 2021/12/16 end*/
#if 0
if (ret != 0 && unsolResponse == RIL_UNSOL_NITZ_TIME_RECEIVED) {
@@ -4848,6 +4851,10 @@
/*LYNQ CMD*/
case LYNQ_AUTO_ANSWER_CALL: return "LYNQ_AUTO_ANSWER_CALL";
case LYNQ_REQUEST_SET_DTMF_VOLUME: return "RIL_REQUEST_SET_DTMF_VOLUME";
+ case LYNQ_REQUEST_WRITE_SMS_TO_MEMORY: return "LYNQ_REQUEST_WRITE_SMS_TO_MEMORY";
+ case LYNQ_REQUEST_READ_SMS_FROM_MEMORY: return "LYNQ_REQUEST_READ_SMS_FROM_MEMORY";
+ case LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY: return "LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY";
+ case LYNQ_REQUEST_LIST_SMS_FROM_MEMORY: return "LYNQ_REQUEST_LIST_SMS_FROM_MEMORY";
default: return "<unknown request>";
}
}
@@ -5104,6 +5111,12 @@
case RIL_REQUEST_QUERY_SIM_RETRY_COUNT: return "RIL_REQUEST_QUERY_SIM_RETRY_COUNT";
case RIL_REQUEST_QUERY_EID: return "RIL_REQUEST_QUERY_EID";
case LYNQ_REQUEST_SET_DTMF_VOLUME: return "RIL_REQUEST_SET_DTMF_VOLUME";
+ /*warren add for t800 ril service 2022/1/22 start*/
+ case LYNQ_REQUEST_WRITE_SMS_TO_MEMORY: return "LYNQ_REQUEST_WRITE_SMS_TO_MEMORY";
+ case LYNQ_REQUEST_READ_SMS_FROM_MEMORY: return "LYNQ_REQUEST_READ_SMS_FROM_MEMORY";
+ case LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY: return "LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY";
+ case LYNQ_REQUEST_LIST_SMS_FROM_MEMORY: return "LYNQ_REQUEST_LIST_SMS_FROM_MEMORY";
+ /*warren add for t800 ril service 2022/1/22 end*/
default: return "<unknown request>";
}
}
@@ -5732,14 +5745,11 @@
int dataSize = p.dataSize();
const uint8_t* data = p.data();
RLOGD("lynqSocketSend RESPONSE!!!! ");
- printf("lynqSocketSend RESPONSE!!!!\n");
sent = sendto(server_socket_fd, data, dataSize, 0, (struct sockaddr *)&pRI->uClient_addr, sizeof(pRI->uClient_addr));
if( sent < 0 )
{
RLOGE("lynqSocketSend send datalen fail (sent=%d, sendFD=%d, dataSize=%d)",
sent,server_socket_fd, dataSize);
- printf("lynqSocketSend send datalen fail (sent=%d, sendFD=%d, dataSize=%d)",
- sent,server_socket_fd, dataSize);
return -1;
}
return 0;
@@ -5760,15 +5770,12 @@
return -1;
}
RLOGD("lynqSocketSend RESPONSE!!!! ");
- printf("lynqSocketSend RESPONSE!!!!\n");
sent = sendto(server_socket_fd, data, dataSize, 0, (struct sockaddr *)&pRI->uClient_addr, sizeof(pRI->uClient_addr));
if( sent < 0 )
{
RLOGE("lynqSocketSend send datalen fail (sent=%d, sendFD=%d, dataSize=%d)",
sent,server_socket_fd, dataSize);
- printf("lynqSocketSend send datalen fail (sent=%d, sendFD=%d, dataSize=%d)",
- sent,server_socket_fd, dataSize);
return -1;
}
return 0;
@@ -5782,6 +5789,7 @@
ssize_t sent = 0;
uint8_t dataLength[4];
int verify = 0x55aa;
+ p.setDataPosition(0);
int dataSize = p.dataSize();
const uint8_t* data = p.data();
sent = sendto(lynq_urc_socket_fd, data, dataSize, 0, (struct sockaddr *)&urc_broadcast_addr, sizeof(urc_broadcast_addr));
@@ -6259,6 +6267,7 @@
void RIL_startEventLoop(void)
{
RLOGD("RIL_startEventLoop()");
+ lynq_init_sms_manager();
/* spin up eventLoop thread and wait for it to get started */
s_started = 0;
pthread_mutex_lock(&s_startupMutex);