Merge "[Bugfix][T106BUG-346] Fix the username and password not taking effect"
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
index e7bda42..d84687d 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-data/lynq_data.cpp
@@ -1132,6 +1132,33 @@
LYERRLOG("handle is null!!!");
return -1;
}
+
+ if(user == NULL || strcmp(user, "NULL") == 0)
+ {
+ argv[1] = NULL;
+ }
+ else
+ {
+ argv[1] = user;
+ }
+
+ if(password == NULL || strcmp(password, "NULL") == 0)
+ {
+ argv[2] = NULL;
+ }
+ else
+ {
+ argv[2] = password;
+ }
+
+ if(authType == NULL || strcmp(authType, "NULL") == 0)
+ {
+ argv[3] = NULL;
+ }
+ else
+ {
+ argv[3] = authType;
+ }
if(normalProtocol==NULL)
{
argv[4] = "IPV4V6";
@@ -1145,9 +1172,7 @@
client.request = 27;//RIL_REQUEST_SETUP_DATA_CALL
client.paramLen = 7;
bzero(client.param,LYNQ_REQUEST_PARAM_BUF);
-
- sprintf(client.param,"%s %s %s %s %s %s %s",apn,apnType,argv[1],argv[2],argv[3],argv[4],argv[5]);
-
+ sprintf(client.param,"%s %s %s %s %s %s %s",apn,apnType,argv[1],argv[2],argv[3],argv[4],roamingProtocol);
LYINFLOG("uToken=%d,request=%d,paralen=%d,param=%s",client.uToken,client.request,client.paramLen,client.param);
pthread_mutex_lock(&g_lynq_data_sendto_mutex);