commit b27ca2398a8b3db9fc654b4ec5204b19e97d1577
author hong.liu <hong.liu@mobiletek.cn> Mon Jul 07 17:21:59 2025 +0800
committer Gerrit Code Review <root@mobiletek-cd-server> Mon Jul 07 17:21:59 2025 +0800
tree 2ff2f84a99a7a364e88ef247b43c8bdded3c03cf
parent 7704687775bc273ed61d0dbf88b96c6ad5585930
parent ac8cb00f50fd48562fab370d24b24fd7991e074e

Merge "[Bugfix][T108][bug-view-1791]close SELINUX" into GSW_V1453

mbtk/libgsw_lib/gsw_sms_interface.c

diff --git a/mbtk/libgsw_lib/gsw_sms_interface.c b/mbtk/libgsw_lib/gsw_sms_interface.c
index a0d74e7..415bc49 100755
--- a/mbtk/libgsw_lib/gsw_sms_interface.c
+++ b/mbtk/libgsw_lib/gsw_sms_interface.c
@@ -442,14 +442,15 @@
 
     if(gsw_sms_callback)
     {
-        if(total_pack > 1 && curr_pack < total_pack)
-        {
+        // if(total_pack > 1 && curr_pack < total_pack)
+        // {
             gsw_sms_callback(GSW_SMS_RECEIVED_FLG, &gsw_sms_msg);
-        }
-        else
-        {
-            gsw_sms_callback(GSW_SMS_FULL_FLG, &gsw_sms_msg);
-        }
+            LOGD("the gsw_sms_state_e is %d\n",GSW_SMS_RECEIVED_FLG);
+        // }
+        // else
+        // {
+        //     gsw_sms_callback(GSW_SMS_FULL_FLG, &gsw_sms_msg);
+        // }
         
     }
 
@@ -508,7 +509,7 @@
         return GSW_HAL_NORMAL_FAIL;
     }
 
-    mbtk_log_init("syslog", "MBTK_RIL");
+    //mbtk_log_init("syslog", "MBTK_RIL");
 
     sms_info_handle = mbtk_info_handle_get();
     if(sms_info_handle == NULL)

package/utils/adbd/src/adb/file_sync_service.c

diff --git a/package/utils/adbd/src/adb/file_sync_service.c b/package/utils/adbd/src/adb/file_sync_service.c
index 3d83eb7..749d5a7 100755
--- a/package/utils/adbd/src/adb/file_sync_service.c
+++ b/package/utils/adbd/src/adb/file_sync_service.c
@@ -582,7 +582,9 @@
                     D("MBTK : chmod(%s, %x) fail.\n", file_name, mode);
                 } else {
                     D("MBTK : chmod(%s, %x) success.\n", file_name, mode);
-                    system("sync");
+                    int result = system("sync");
+                    if (result)
+                        fail_message(fd, "system failure");
                 }
             }
 #endif

package/utils/adbd/src/adb/services.c

diff --git a/package/utils/adbd/src/adb/services.c b/package/utils/adbd/src/adb/services.c
index b57e891..1181b8a 100755
--- a/package/utils/adbd/src/adb/services.c
+++ b/package/utils/adbd/src/adb/services.c
@@ -425,6 +425,7 @@
     switch (mode) {
     case SUBPROC_PTY:
         ret_fd = create_subproc_pty(SHELL_COMMAND, arg0, arg1, &pid);
+        printf("cmd is %s\n",SHELL_COMMAND);
         break;
     case SUBPROC_RAW:
         ret_fd = create_subproc_raw(SHELL_COMMAND, arg0, arg1, &pid);

target/linux/mmp/base-files/bin/adb_shell

diff --git a/target/linux/mmp/base-files/bin/adb_shell b/target/linux/mmp/base-files/bin/adb_shell
index befe636..d95d930 100755
--- a/target/linux/mmp/base-files/bin/adb_shell
+++ b/target/linux/mmp/base-files/bin/adb_shell
@@ -1,14 +1,15 @@
 #!/bin/sh
 export ENV='/etc/adb_profile'
 
-USER_NAME=root
+#USER_NAME=root
 
-#if [ $1 = '-' ];then
-#    /bin/login
-#elif [ $1 = '-c' ];then
-#    /bin/login -c "$2"
-#else
-#    /bin/login
-#fi
+if [ $1 = '-' ];then
+    /bin/login
+elif [ $1 = '-c' ];then
+    /bin/login -c "$2"
+else
+    /bin/login
 
-/bin/login $USER_NAME
+fi
+
+#/bin/login $USER_NAME