Merge "[Bugfix][T106BUG-115][Network] lynq_set_state_buffer_valid_period_of_network,  return 1, Only Configure: No, Affected branch: unknown, Affected module: unknown, Is it affected on both ZXIC and MTK: ZXIC only, Self-test: Yes, Doc Update: No"
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc/fs/normal/rootfs/etc/init.d/fscheck.sh b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc/fs/normal/rootfs/etc/init.d/fscheck.sh
index 7aa0f8a..d0db7c2 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc/fs/normal/rootfs/etc/init.d/fscheck.sh
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-core/images/files/zx297520v3/vehicle_dc/fs/normal/rootfs/etc/init.d/fscheck.sh
@@ -4,6 +4,7 @@
 mkdir -p /mnt/userdata/cache
 mkdir -p /mnt/userdata/var/run
 mkdir -p /mnt/userdata/var/log
+mkdir -p /mnt/userdata/ril/network
 
 if [ -b /dev/mmcblk1p1 ]; then
 	if [ -f /run/media/mmcblk1p1 ]; then
diff --git a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-network/liblynq-network.bb b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-network/liblynq-network.bb
index 055a0c9..d6b8863 100755
--- a/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-network/liblynq-network.bb
+++ b/cap/zx297520v3/sources/meta-zxic-custom/recipes-lynq/liblynq-network/liblynq-network.bb
@@ -21,7 +21,7 @@
                 'TARGET_PLATFORM = ${TARGET_PLATFORM}'"

 

 FILES_${PN} = "${base_libdir}/*.so "

-FILES_${PN} += "/data/ril/network"

+

 

 FILES_${PN}-dev = "/test \

                    ${includedir}"

@@ -55,7 +55,6 @@
     if [ -d "${WORKONSRC}" ] ; then

         install -d ${D}${includedir}/lynq_network

         cp -arf ${SRC-DIR}/include/lynq_network ${D}${includedir}/lynq_network	

-        install -d ${D}/data/ril/network		

     fi 

 }

 

diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_module_state_buffer.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_module_state_buffer.cpp
index 1d0b5af..681192f 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_module_state_buffer.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_module_state_buffer.cpp
@@ -23,12 +23,12 @@
 static int s_state_buffer_valid[NETWORK_STATE_BUFFER_TYPE_MAX]={false,false,false};

 

 static char* s_state_buffer_file[NETWORK_STATE_BUFFER_TYPE_MAX]={

-     "/data/ril/network/.network_register_voice_buffer",

-     "/data/ril/network/.network_register_data_buffer",

-     "/data/ril/network/.network_register_ims_buffer"

+     "/mnt/userdata/ril/network/.network_register_voice_buffer",

+     "/mnt/userdata/ril/network/.network_register_data_buffer",

+     "/mnt/userdata/ril/network/.network_register_ims_buffer"

 };

 

-#define STATE_BUFFER_CONFIG_FILE  "/data/ril/network/.state_buffer_cfg"

+#define STATE_BUFFER_CONFIG_FILE  "/mnt/userdata/ril/network/.state_buffer_cfg"

 typedef struct{

     int valid_period[NETWORK_STATE_BUFFER_TYPE_MAX];   

 }network_state_buffer_cfg;