commit b07f4e15e0595471ae4858a29527a8e1030fba02
author lh <lh@exm.com> Thu Feb 17 22:08:54 2022 -0800
committer lh <lh@exm.com> Thu Feb 17 22:08:54 2022 -0800
tree b9b513aac7dcb8a4b3c56d939f545ce21f0508b0
parent f512fa3fdbd3c7098ac3192b02563581c8878e79

[merged]
1.MT2735_MP1_MR1.0 merged,without MR1.0-dpramk

Change-Id: I652723435ec940ee8c0b9bc6ff2d6e80557a0429

framework/lynq-ril-service/src/cc.cpp

diff --git a/framework/lynq-ril-service/src/cc.cpp b/framework/lynq-ril-service/src/cc.cpp
index 369bd2f..f212ff7 100755
--- a/framework/lynq-ril-service/src/cc.cpp
+++ b/framework/lynq-ril-service/src/cc.cpp
@@ -1,3 +1,4 @@
+//SPDX-License-Identifier: MediaTekProprietary
 /* Copyright Statement:
  *
  * This software/firmware and related documentation ("MediaTek Software") are
@@ -245,7 +246,7 @@
     } else {
         vol_value = get_mixer_ctrl_volume_value(g_mixer_name_volume_bt);
     }
-    RLOGD("The ctrl \"%s\" is set to %d", g_mixer_name_volume, vol_value);
+    RLOGD("The ctrl \"%s\" is set to %ld", g_mixer_name_volume, vol_value);
     return vol_value;
 }
 
@@ -1164,10 +1165,10 @@
     /* DL:0 UL:1 */
     if (path == 0) {
         is_mute = get_mixer_ctrl_value_int(g_DL_mute_name);
-        RLOGD("The ctrl \"%s\" is set to %d", g_DL_mute_name, is_mute);
+        RLOGD("The ctrl \"%s\" is set to %ld", g_DL_mute_name, is_mute);
     } else {
         is_mute = get_mixer_ctrl_value_int(g_UL_mute_name);
-        RLOGD("The ctrl \"%s\" is set to %d", g_UL_mute_name, is_mute);
+        RLOGD("The ctrl \"%s\" is set to %ld", g_UL_mute_name, is_mute);
     }
 
     return is_mute;
@@ -1180,7 +1181,7 @@
 
 int getCallMute() {
     long int cc_mute = mixer_get_mute(1);
-    RLOGD("getCallMute: %d", cc_mute);
+    RLOGD("getCallMute: %ld", cc_mute);
     return cc_mute;
 }
 
@@ -1236,6 +1237,7 @@
         StopRecord();
         sendCallMsg(false); // for Power Manager test.
         dtmf_stop(dtmf_handle);
+        dtmf_handle = NULL;
         if (speechStatus == NORMAL_SPEECH_ON) {
             mixer_set(0);
         } else {
@@ -1353,7 +1355,7 @@
 
     if ((std::stoi(dir) == 1) && (std::stoi(sip_msg_type) == 0)
             && (std::stoi(method) == 4) && (std::stoi(resp_code) == 0)) {
-        std::string msg("SIP CANCEL：");
+        std::string msg("SIP CANCEL:");
         msg.append(reason_text);
         printf("%s", msg.c_str());
     }
@@ -1382,7 +1384,7 @@
         numStrings = responselen / sizeof(char *);
         RLOGD("[slot%d]handleUnsolCallInfoInd: numStrings: %d",socket_id, numStrings);
         if(numStrings < 9) {
-            RLOGE("[slot%d]handleUnsolCallInfoInd, invalid numStrings(%d) < 9, no pau value : numStrings", socket_id);
+            RLOGE("[slot%d]handleUnsolCallInfoInd, invalid numStrings < 9, no pau value : numStrings", socket_id);
             return -1;
         } else {
             RLOGD("[slot%d]handleUnsolCallInfoInd(): pau: %s", socket_id, p_cur[8]);
@@ -1420,7 +1422,7 @@
     numInts = responselen / sizeof(int);
     RLOGD("[slot%d]handleRingbackTone: numInts: %d",socket_id, numInts);
     if(numInts < 1) {
-        RLOGE("[slot%d]handleRingbackTone, invalid numStrings(%d) < 1", socket_id);
+        RLOGE("[slot%d]handleRingbackTone, invalid numStrings < 1", socket_id);
         return -1;
     } else {
         int start = p_int[0];