commit c32839826f2da5221e34cb6506a1da0b0ed34353
author liuyang <leo.liu@mobiletek.cn> Tue Jun 04 17:00:15 2024 +0800
committer liuyang <leo.liu@mobiletek.cn> Tue Jun 04 17:00:15 2024 +0800
tree 529dc508abf2bbc80a1ecc541e57a5fd8570111f
parent 195e252fdf0805d7940e7d1c2359ee4ab00f437e

[data]BUG86810 & 86836

Change-Id: Id73ac0aaf3a850d70547c4d74740e32a24750a23

mbtk/mbtk_rild/src/mbtk_data_call.c

diff --git a/mbtk/mbtk_rild/src/mbtk_data_call.c b/mbtk/mbtk_rild/src/mbtk_data_call.c
index 8a6dc2f..542b5e4 100644
--- a/mbtk/mbtk_rild/src/mbtk_data_call.c
+++ b/mbtk/mbtk_rild/src/mbtk_data_call.c
@@ -264,7 +264,7 @@
         LOGE("paran is NULL.");
         return MBTK_RESULT_FAIL;
     }
-
+     
     //check 2 - 7
     int pdp_type_tmp = 1;
     for (;pdp_type_tmp <= MBTK_APN_CID_MAX; pdp_type_tmp++)
@@ -275,23 +275,30 @@
         }
         if( (apn_set_state[pdp_type_tmp] == '1') || (apn_set_state[pdp_type_tmp] == '2') )
         {
-            if(strcmp((char *)apninfo_s[pdp_type_tmp].apn_type, (char *)apn_type) == 0)
+            if(0x0 != apn_type[0])
             {
-                LOGE("apn_type is same!idx = [%d]", pdp_type_tmp);
-                return MBTK_RESULT_FAIL;
-            }
-            if (strcmp((char *)apninfo_s[pdp_type_tmp].apn_name, (char *)apn_name) == 0)
-            {
-                if(apninfo_s[pdp_type_tmp].ip_type == MBTK_IP_TYPE_IPV4V6 || ip_type == MBTK_IP_TYPE_IPV4V6)
+                if(strcmp((char *)apninfo_s[pdp_type_tmp].apn_type, (char *)apn_type) == 0)
                 {
-                    LOGE("[qser_data] apn_name is same and pdp_type is IPV4V6!idx = [%d]", pdp_type_tmp);
+                    LOGE("apn_type is same!idx = [%d]", pdp_type_tmp);
                     return MBTK_RESULT_FAIL;
                 }
-
-                if(apninfo_s[pdp_type_tmp].ip_type == ip_type)
+            }
+            
+            if(0x0 != apn_name[0])
+            {
+                if (strcmp((char *)apninfo_s[pdp_type_tmp].apn_name, (char *)apn_name) == 0)
                 {
-                    LOGE("pdp_type is same and pdp_type is same!idx = [%d]", pdp_type_tmp);
-                    return MBTK_RESULT_FAIL;
+                    if(apninfo_s[pdp_type_tmp].ip_type == MBTK_IP_TYPE_IPV4V6 || ip_type == MBTK_IP_TYPE_IPV4V6)
+                    {
+                        LOGE("[qser_data] apn_name is same and pdp_type is IPV4V6!idx = [%d]", pdp_type_tmp);
+                        return MBTK_RESULT_FAIL;
+                    }
+
+                    if(apninfo_s[pdp_type_tmp].ip_type == ip_type)
+                    {
+                        LOGE("pdp_type is same and pdp_type is same!idx = [%d]", pdp_type_tmp);
+                        return MBTK_RESULT_FAIL;
+                    }
                 }
             }
         }

mbtk/mbtk_rild/src/mbtk_info_server.c

diff --git a/mbtk/mbtk_rild/src/mbtk_info_server.c b/mbtk/mbtk_rild/src/mbtk_info_server.c
old mode 100755
new mode 100644
index 8c047a5..755e94f
--- a/mbtk/mbtk_rild/src/mbtk_info_server.c
+++ b/mbtk/mbtk_rild/src/mbtk_info_server.c
@@ -3420,11 +3420,7 @@
     }
     if(strlen(apn->apn) > 0) {
         index += sprintf(cmd + index,"\"%s\"", apn->apn);
-    } else {
-        LOGE("No set APN.");
-        err = -1;
-        goto exit;
-    }
+    } 
 
     err = at_send_command(cmd, &response);
     if (err < 0 || response->success == 0){