Merge "[Bugfix][T106BUG-347] Fix the *err not update"
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
index 47b5562..2928d8d 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
@@ -990,6 +990,10 @@
if (NULL == data_call || NULL == err)
{
LYERRLOG("call start incoming paramters error");
+ if(err != NULL)
+ {
+ *err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
+ }
return ret;
}
if (data_call->profile_idx == 0)
@@ -1004,12 +1008,13 @@
if (ret != 0)
{
LYERRLOG("qser_apn_get error");
+ *err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
return ret;
}
judge_pdp_type(apn_info.pdp_type,pdptype);
ret = lynq_setup_data_call_sp(&handle,apn_info.apn_name,apn_info.apn_type,apn_info.username,apn_info.password,NULL,pdptype,pdptype);
}
- if (ret < 0)
+ if (ret != 0)
{
*err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
}
@@ -1026,12 +1031,18 @@
LYERRLOG("call stop incoming paramters error");
return ret;
}
- data_call_handle_get(profile_idx,&handle);
+ ret = data_call_handle_get(profile_idx,&handle);
+ if(ret != 0)
+ {
+ LYERRLOG("datacall handle get error");
+ *err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
+ return ret;
+ }
ret = lynq_deactive_data_call(&handle);
- if (ret < 0)
+ if (ret != 0)
{
*err = QSER_DATA_CALL_ERROR_INVALID_PARAMS;
- return *err;
+ return ret;
}
return ret;
}
diff --git a/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/data.cpp b/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/data.cpp
index b3d1971..01ba78e 100755
--- a/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/data.cpp
+++ b/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/data.cpp
@@ -167,6 +167,7 @@
memcpy(datacall.cdma_password, argv[5], QSER_APN_PASSWORD_SIZE);
ret = qser_data_call_start(&datacall, &err);
+ printf("LYNQ_QSER_SETUP_DATA_CALL err = %d\n", err);
printf("%s%d\n",TEST_RESULT,ret);
return ret;
}
@@ -197,6 +198,7 @@
}
ret = qser_data_call_stop(profile_idx_int, ip_family, &err);
+ printf("LYNQ_QSER_DEACTIVATE_DATA_CALL err = %d\n", err);
printf("%s%d\n",TEST_RESULT,ret);
return ret;
}