[Feature][Modem]Merge MTK release P3 P4 patch

Change-Id: I1ef3d69e36378ee73a422ecb2721488d6b416427
diff --git a/mcu/protocol/interface/ims/ims_common_def.h b/mcu/protocol/interface/ims/ims_common_def.h
index 49b4b02..d90f054 100755
--- a/mcu/protocol/interface/ims/ims_common_def.h
+++ b/mcu/protocol/interface/ims/ims_common_def.h
@@ -53,6 +53,11 @@
  *===========================================================
  * $Log$
  *
+ * 09 16 2022 xin.ni
+ * [MOLY00827342] [FOCUS][MT6879][Figeac][S0][R2][JAPAN][SOFTBANK][SIM][Lab][OTR-Voice-032031] VoLTE 4sec cancel timer to apply to EPS-FB case
+ * 	
+ * 	.
+ *
  * 07 28 2022 ot_gang.zhang
  * [MOLY00823817] [MT6879][Figeac][S0][R2][JAPAN][SOFTBANK][TB][TrialNW][SIP PANI Info][CR Review Excluded] Supporting OTR-Voice-032066
  * 	
@@ -295,9 +300,9 @@
  * .
  *
  * 04 03 2020 delphine.wang
- * [MOLY00508252] [MT6889][Petrus][5G FT][5GMM][China][CMCC][SA][IODT][端到端][OPPO Load][Hangzhou][2.1]1314_CMCC+CMCC??1ï¿??????????��???HD???????��?
- * [MOLY00508252] [MT6889][Petrus][5G FT][5GMM][China][CMCC][SA][IODT][端到端][OPPO Load][Hangzhou][2.1]1314_CMCC+CMCC??1ï¿??????????��???HD???????��?
- * [MOLY00508252] [MT6889][Petrus][5G FT][5GMM][China][CMCC][SA][IODT][端到端][OPPO Load][Hangzhou][2.1]1314_CMCC+CMCC??1ï¿?????��???HD???????��?
+ * [MOLY00508252] [MT6889][Petrus][5G FT][5GMM][China][CMCC][SA][IODT][端到端][OPPO Load][Hangzhou][2.1]1314_CMCC+CMCC??1�??????????��???HD???????��?
+ * [MOLY00508252] [MT6889][Petrus][5G FT][5GMM][China][CMCC][SA][IODT][端到端][OPPO Load][Hangzhou][2.1]1314_CMCC+CMCC??1�??????????��???HD???????��?
+ * [MOLY00508252] [MT6889][Petrus][5G FT][5GMM][China][CMCC][SA][IODT][端到端][OPPO Load][Hangzhou][2.1]1314_CMCC+CMCC??1�?????��???HD???????��?
  * 	
  * 	.
  *
@@ -896,7 +901,7 @@
 #define VOLTE_MAX_SERVICE_ROUTE_LENGTH                  256
 #define VOLTE_MAX_TIMESTAMP_LENGTH                      256
 #define VOLTE_MAX_SECURIT_VERIFY_LENGTH                 768 //6 algo combo
-#define VOLTE_MAX_USER_AGENT_LENGTH                     128
+#define VOLTE_MAX_USER_AGENT_LENGTH                     256
 #define VOLTE_MAX_P_ACCESS_NETWORK_INFO_LENGTH          256
 #define VOLTE_MAX_DIGIT_PIDENTIFIER_LENGTH              256
 #define VOLTE_MAX_DIGIT_PPA_LENGTH                      4096
@@ -2257,6 +2262,7 @@
     IMC_PS_CAUSE_PROTOCO_ERROR_UNSPECIFIED                              = 111,
     IMC_PS_CAUSE_APN_RESTRICTION_VALUE_INCOMPATIBLE_WITH_ACTIVE_EPS_BEARER_CONTEXT = 112,
     IMC_PS_CAUSE_REQUEST_REJECTED_CORE_TX_FAILURE                       = 113,
+    IMC_PS_CAUSE_TCM_L4C_MODIFY_DUE_TO_INTERRAT                         = 114,
 
     /* WFC */
     IMC_PS_CAUSE_REMAP = 200,
@@ -3362,7 +3368,8 @@
     IMS_CC_CAUSE_BEREJECT_380_EMERGENCY_ACTION_ELEM_UNKNOWN, /* receive 380 alternative service, without contact header, XML type is emergency but unknown or missing action element. */
     IMS_CC_CAUSE_RETRY_IMS_VIDEO_TO_VOICE,
     IMS_CC_CAUSE_NO_RETRY_BAR_IMS,  /*Huawei's requirement, bar IMS for some specific scenarios, then VDM will only try CS during a time period*/
-	IMS_CC_CAUSE_BEREJECT_380_FLIGHTMODE_CS, /* For Claro requirement , UI should pop-up message when receive 380 alternative service during FlightMode, mapping to CS SERVICE_NOT_AVAILABLE = 380. Other behavior is same as Bereject_380 (cause = 7)*/
+    IMS_CC_CAUSE_BEREJECT_380_FLIGHTMODE_CS, /* For Claro requirement , UI should pop-up message when receive 380 alternative service during FlightMode, mapping to CS SERVICE_NOT_AVAILABLE = 380. Other behavior is same as Bereject_380 (cause = 7)*/
+    IMS_CC_CAUSE_NO_RETRY_EMERGENCY, /* For KDDI requirement, MD don't retry IMS/CS when UA receive error code, AP may customize to choice another sim card to retry */
     IMS_CC_CAUSE_UA_MAX,
 
     // Source: IMC