commit 9c49d2dc89cd4dd53514dac8aa8cac2807e6a5ff
author you.chen <you.chen@mobiletek.cn> Thu Dec 07 13:30:06 2023 +0800
committer Gerrit Code Review <jenkins2@jenkins2-Vostro-3690> Thu Dec 07 13:30:06 2023 +0800
tree a117869278e7805db86f63c10c7f29f464b740bb
parent e12434118c56a50722d58e28751067cc65b15d87
parent 5bd82727a34a57ca9d1d5faca22d10395fef3c5b

Merge "[Bugfix][API-1474]ril-service memory leak problem occurs when short messages are repeatedly read, received, and deleted." into GSW3.0-No-Connman

lib/liblynq-data/lynq_data.cpp

diff --git a/lib/liblynq-data/lynq_data.cpp b/lib/liblynq-data/lynq_data.cpp
index 248000d..e5b23e8 100755
--- a/lib/liblynq-data/lynq_data.cpp
+++ b/lib/liblynq-data/lynq_data.cpp
@@ -826,6 +826,7 @@
                     sendSignalApnChange();
                 }
                 free(urc_msg);
+                break;
             }
         case LYNQ_TELEPHONY_RESTART:
             {
@@ -837,12 +838,9 @@
                     pthread_mutex_lock(&s_lynq_urc_vector_mutex);
                     s_data_urc_wait_list.push_back(TELEPHONY_RESTART);
                     pthread_mutex_unlock(&s_lynq_urc_vector_mutex);
-                    radio_switch(0);
-                    sleep(1);
-                    radio_switch(1);
-                    sleep(1);
                     sendSignalPdnChange();
                 }
+                break;
             }
         default:
             break;

lib/liblynq-wifi6/libwifi6.c

diff --git a/lib/liblynq-wifi6/libwifi6.c b/lib/liblynq-wifi6/libwifi6.c
index 77d826e..94a094d 100755
--- a/lib/liblynq-wifi6/libwifi6.c
+++ b/lib/liblynq-wifi6/libwifi6.c
@@ -2194,7 +2194,7 @@
     DO_OK_FAIL_REQUEST(lynq_wifi_ssid_cmd);
     DO_OK_FAIL_REQUEST(cmd_save_config);
 
-    RLOGD("[lynq_wifi_ap_ssid_set] set ssid sucss");
+    RLOGD("[lynq_wifi_ap_ssid_set] set ssid succeed %d",__LINE__);
     return 0;
 
 }
@@ -3869,7 +3869,7 @@
 
 int lynq_wifi_sta_start(lynq_wifi_index_e idx)
 {
-
+    RLOGD("enter %s %d func",__func__,__LINE__);
     const char *lynq_enable_sta_cmd = "wpa_cli -iwpa_wlan0_cmd -p/var/run/ IFNAME=wlan0 enable_net all";
     const char *lynq_reconnect_cmd = "wpa_cli -iwpa_wlan0_cmd -p/var/run/ IFNAME=wlan0 reconnect";
 
@@ -3879,7 +3879,7 @@
     ret = system_call_v("%s %s", start_stop_sta_script, "start");
     if (ret != 0)
     {
-        RLOGE("lynq_wifi_ap_start excute script fail");
+        RLOGE("lynq_wifi_sta_start excute script fail %s %d",__func__,__LINE__);
         return -1;
     }
 
@@ -3889,6 +3889,7 @@
     g_history_disconnect_valid_num = 0;   //clean history_disconenct_list info
     s_sta_status = INNER_STA_STATUS_INIT;
     pthread_mutex_unlock(&s_global_check_mutex);
+    RLOGD("end %s %d func",__func__,__LINE__);
     return 0;
 }
 
@@ -3935,7 +3936,7 @@
     ret = system_call_v("%s %s", start_stop_sta_script, "stop");
     if (ret != 0)
     {
-        RLOGE("lynq_wifi_ap_start excute script fail");
+        RLOGE("lynq_wifi_sta_stop excute script fail %s %d",__func__,__LINE__);
         return -1;
     }
 
@@ -3950,7 +3951,7 @@
         {
             break;
         }
-        RLOGD("lynq_wifi_ap_start curr state %s", state);
+        RLOGD("lynq_wifi_sta_stop curr state %s %s %d", state,__func__,__LINE__);
         usleep(SLEEP_TIME_ON_IDLE);
     }
     pthread_mutex_lock(&s_global_check_mutex);
@@ -4321,7 +4322,7 @@
     }
 
     pthread_mutex_unlock(&s_check_wpa_ctrl_mutex);
-    RLOGD("creat APWatcherTheradProc susccs");
+    RLOGD("creat APWatcherTheradProc succeed");
 
     return 0;
 }
@@ -4366,7 +4367,7 @@
     }
 
     pthread_mutex_unlock(&s_check_wpa_ctrl_mutex);
-    RLOGD("creat STAWatcherTheradProc susccs");
+    RLOGD("creat STAWatcherTheradProc succeed");
     return 0;
 }
 
@@ -4407,7 +4408,7 @@
         }
     }
     pthread_mutex_unlock(&s_check_wpa_ctrl_mutex);
-    RLOGD("creat STAWatcherTheradProc susccs");
+    RLOGD("creat STAWatcherTheradProc succeed");
     return 0;
 }
 int lynq_unreg_sta_auto_event_callback(void * priv) {
@@ -4865,7 +4866,6 @@
     if (ret != 0)
     {
         RLOGE("[lynq_get_connect_ap_ip] inner_get_ip_by_mac return fail");
-        return -1;
     }
 
     if (ip[0] == '\0' || strchr(ip, ':') != NULL) //temp change, not ok