commit e37eaf3bf93a53b7ab2f1caee8b3f10d4c4974d9
author rjw <rjw@exm.com> Mon Jun 20 10:17:36 2022 +0800
committer Gerrit Code Review <jenkins2@jenkins2-Vostro-3690> Mon Jun 20 10:17:36 2022 +0800
tree 1f92a19a4497ade8766022786596898a9ae71e0f
parent 92b9feea5dc47260f929a3cecb2d39e0799ce0a1
parent dd1ec8df1b12e1c98550aa6d7f4b9de5b2607c6b

Merge "[Bugfix][API-333][FOTA]Fota interface with wakeup lock" into MR1.0

src/lynq/framework/lynq-ril-service/src/ecall/eCall.cpp

diff --git a/src/lynq/framework/lynq-ril-service/src/ecall/eCall.cpp b/src/lynq/framework/lynq-ril-service/src/ecall/eCall.cpp
index fbb33e3..6026161 100755
--- a/src/lynq/framework/lynq-ril-service/src/ecall/eCall.cpp
+++ b/src/lynq/framework/lynq-ril-service/src/ecall/eCall.cpp
@@ -704,7 +704,8 @@
             stop_ecall_timer(sT6,sT6_sig_value);
             stop_ecall_timer(sT7,sT7_sig_value);
             start_ecll_timer(sAutoAnsTimer,autoAns_sig_value, AUTOANS_TIMEOUT);
-            autoAnswerEcall(true);           
+            autoAnswerEcall(true);       
+            ecall_test_sub_recover();
         }
         break;
     }

src/lynq/lib/liblynq-media/liblynq-media/media_control.c

diff --git a/src/lynq/lib/liblynq-media/liblynq-media/media_control.c b/src/lynq/lib/liblynq-media/liblynq-media/media_control.c
index 15fd227..396cc2e 100755
--- a/src/lynq/lib/liblynq-media/liblynq-media/media_control.c
+++ b/src/lynq/lib/liblynq-media/liblynq-media/media_control.c
@@ -12,12 +12,12 @@
 #define NV_MIC_VOLUME_NAME    "ro.mic.volume.level"

 //static char *volume_rcv = "/tmp/libmodem-afe-ctrl/server_rcv";

 static const int VOLUME_LEVEL_1 = 1;//0;

-static const int VOLUME_LEVEL_2 = 10923;//200;

-static const int VOLUME_LEVEL_3 = 21845;//209;

-static const int VOLUME_LEVEL_4 = 32767;//220;

-static const int VOLUME_LEVEL_5 = 43960;//234;

-static const int VOLUME_LEVEL_6 = 54612;//245;

-static const int VOLUME_LEVEL_7 = 65535;//255;

+static const int VOLUME_LEVEL_2 = 22;//200;

+static const int VOLUME_LEVEL_3 = 43;//209;

+static const int VOLUME_LEVEL_4 = 64;//220;

+static const int VOLUME_LEVEL_5 = 85;//234;

+static const int VOLUME_LEVEL_6 = 106;//245;

+static const int VOLUME_LEVEL_7 = 127;//255;

 

 static const int MIC_VOLUME_LEVEL_1 = 9;

 static const int MIC_VOLUME_LEVEL_2 = 19;

@@ -168,7 +168,7 @@
     char cmd[256];

     RLOGD("spk real volume: %d \n", volume);

    // sprintf(cmd, "amixer -c0 cset name=\"Playback Volume\" %d", volume);

-    sprintf(cmd, "amixer cset name=\"Master Playback Volume\" %d", volume);

+    sprintf(cmd, "amixer -c0 cset name=\"Line DAC Playback Volume\" %d", volume);

     system(cmd);

     return 0;

 }

src/lynq/lib/liblynq-thermal/src/lynq_get_thermal.c

diff --git a/src/lynq/lib/liblynq-thermal/src/lynq_get_thermal.c b/src/lynq/lib/liblynq-thermal/src/lynq_get_thermal.c
index 3087cee..dad9076 100755
--- a/src/lynq/lib/liblynq-thermal/src/lynq_get_thermal.c
+++ b/src/lynq/lib/liblynq-thermal/src/lynq_get_thermal.c
@@ -34,13 +34,14 @@
     }

 

     ret = read(fd, buf, sizeof(buf));

-    memcpy(out_buf, buf, out_buf_len);

+

 

     if(ret<0){

         close(fd);

         printf("[%s-%d] read error!!!\n", __FUNCTION__, __LINE__);

         return LYNQ_THM_READ_ERROR;

     }

+    memcpy(out_buf, buf, out_buf_len);

     close(fd);

 

     return LYNQ_THM_OK;

@@ -51,7 +52,7 @@
     char tz_path[LYNQ_THM_PATH] = "";

     char buf[LYNQ_THM_PATH] = "";

 

-    if(num < 0 && num > 19)

+    if(num < 0 || num > 19)

     {

         printf("[%s-%d] no such device,please reinput!!\n", __FUNCTION__, __LINE__);

         return  LYNQ_THM_ZONE_ERROR;

@@ -65,7 +66,8 @@
     int ret = read_sys_info(tz_path, buf, LYNQ_THM_PATH);

     if(!ret)

     {

-        *temp = atoi(buf);

+        if(strlen(buf))

+            *temp = atoi(buf);

     }

 

     return ret;