Snap for 11981331 from 7427169bcb to 24Q4-release

Change-Id: I8d00f9b62e2daf0f8473baa1491fe53190e01d83

audio/caiman/aidl_config/mixer_paths_aidl.xml

@@ -1297,6 +1297,10 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
@@ -1331,6 +1335,10 @@
     <path name="microphones (VOICE)" />
   </path>
 
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
+  </path>
+
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>

audio/caiman/tuning/fortemedia/BLUETOOTH.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  BLUETOOTH
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-28 10:09:25
+#SAVE_TIME  2024-06-06 17:12:26
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -2856,22 +2856,22 @@
 149    0x0800    //TX_AEC_REF_GAIN_2
 150    0x7A00    //TX_EAD_THR
 151    0x1000    //TX_THR_RE_EST
-152    0x0200    //TX_MIN_EQ_RE_EST_0
+152    0x0800    //TX_MIN_EQ_RE_EST_0
 153    0x0100    //TX_MIN_EQ_RE_EST_1
 154    0x0200    //TX_MIN_EQ_RE_EST_2
 155    0x0200    //TX_MIN_EQ_RE_EST_3
 156    0x0200    //TX_MIN_EQ_RE_EST_4
 157    0x0200    //TX_MIN_EQ_RE_EST_5
 158    0x0200    //TX_MIN_EQ_RE_EST_6
-159    0x1000    //TX_MIN_EQ_RE_EST_7
+159    0x6000    //TX_MIN_EQ_RE_EST_7
-160    0x1000    //TX_MIN_EQ_RE_EST_8
+160    0x6000    //TX_MIN_EQ_RE_EST_8
-161    0x1000    //TX_MIN_EQ_RE_EST_9
+161    0x7FFF    //TX_MIN_EQ_RE_EST_9
-162    0x1000    //TX_MIN_EQ_RE_EST_10
+162    0x7FFF    //TX_MIN_EQ_RE_EST_10
-163    0x1000    //TX_MIN_EQ_RE_EST_11
+163    0x7FFF    //TX_MIN_EQ_RE_EST_11
-164    0x1000    //TX_MIN_EQ_RE_EST_12
+164    0x7FFF    //TX_MIN_EQ_RE_EST_12
 165    0x4000    //TX_LAMBDA_RE_EST
 166    0x4000    //TX_LAMBDA_CB_NLE
-167    0x0000    //TX_C_POST_FLT
+167    0x7FFF    //TX_C_POST_FLT
 168    0x5000    //TX_GAIN_NP
 169    0x02A0    //TX_SE_HOLD_N
 170    0x00C8    //TX_DT_HOLD_N
@@ -2902,7 +2902,7 @@
 195    0x0000    //TX_NORMENERHIGHTH
 196    0x0000    //TX_NORMENERHIGHTHL
 197    0x7FFD    //TX_DTD_THR1_0
-198    0x797C    //TX_DTD_THR1_1
+198    0x7B70    //TX_DTD_THR1_1
 199    0x7FF0    //TX_DTD_THR1_2
 200    0x7148    //TX_DTD_THR1_3
 201    0x7FFB    //TX_DTD_THR1_4
@@ -2929,8 +2929,8 @@
 222    0x023E    //TX_ADPT_STRICT_H
 223    0x0001    //TX_RATIO_DT_L_TH_LOW
 224    0x0A98    //TX_RATIO_DT_H_TH_LOW
-225    0x03E8    //TX_RATIO_DT_L_TH_HIGH
+225    0x1388    //TX_RATIO_DT_L_TH_HIGH
-226    0x32C8    //TX_RATIO_DT_H_TH_HIGH
+226    0x6D60    //TX_RATIO_DT_H_TH_HIGH
 227    0x0001    //TX_RATIO_DT_L0_TH
 228    0x2000    //TX_B_POST_FILT_ECHO_L
 229    0x7FFF    //TX_B_POST_FILT_ECHO_H
@@ -2938,7 +2938,7 @@
 231    0x1000    //TX_B_LESSCUT_RTO_ECHO
 232    0x0000    //TX_EPD_OFFSET_00
 233    0x0000    //TX_EPD_OFFST_01
-234    0x0320    //TX_RATIO_DT_L0_TH_HIGH
+234    0x1194    //TX_RATIO_DT_L0_TH_HIGH
 235    0x7FFF    //TX_RATIO_DT_H_TH_CUT
 236    0x7FFF    //TX_MIN_EQ_RE_EST_13
 237    0x0000    //TX_DTD_THR1_7
@@ -3671,7 +3671,7 @@
 964    0x0200    //TX_EASSA_AEC_NSSA_REFG_2
 965    0x0200    //TX_EASSA_AEC_NSSA_REFG_3
 966    0x0200    //TX_EASSA_AEC_NSSA_REFG_4
-967    0x0200    //TX_EASSA_AEC_NSSA_REFG_5
+967    0x6000    //TX_EASSA_AEC_NSSA_REFG_5
 968    0x0000    //TX_EASSA_AEC_NSSA_GAIN
 969    0x2710    //TX_EASSA_BIG_NONLINEAR_TH
 970    0x0000    //TX_EASSA_AEC_REFG_STNONL_0
@@ -3679,7 +3679,7 @@
 972    0x0400    //TX_EASSA_AEC_REFG_STNONL_2
 973    0x0400    //TX_EASSA_AEC_REFG_STNONL_3
 974    0x0400    //TX_EASSA_AEC_REFG_STNONL_4
-975    0x0100    //TX_EASSA_AEC_REFG_STNONL_5
+975    0x6000    //TX_EASSA_AEC_REFG_STNONL_5
 976    0x00A0    //TX_EASSA_AEC_FEMALE_ECHO_TH
 977    0x0032    //TX_EASSA_NONLECHO_TH
 978    0x4E20    //TX_EASSA_NONLECHO_ECHOENTH
@@ -5568,7 +5568,7 @@
 166    0x3000    //TX_LAMBDA_CB_NLE
 167    0x4000    //TX_C_POST_FLT
 168    0x2000    //TX_GAIN_NP
-169    0x0260    //TX_SE_HOLD_N
+169    0x02C0    //TX_SE_HOLD_N
 170    0x00C8    //TX_DT_HOLD_N
 171    0x0180    //TX_DT2_HOLD_N
 172    0x6666    //TX_AEC_RESRV_0
@@ -5624,7 +5624,7 @@
 222    0x023E    //TX_ADPT_STRICT_H
 223    0x0001    //TX_RATIO_DT_L_TH_LOW
 224    0x1A98    //TX_RATIO_DT_H_TH_LOW
-225    0x2EE0    //TX_RATIO_DT_L_TH_HIGH
+225    0x0BB8    //TX_RATIO_DT_L_TH_HIGH
 226    0x5DC0    //TX_RATIO_DT_H_TH_HIGH
 227    0x0001    //TX_RATIO_DT_L0_TH
 228    0x2000    //TX_B_POST_FILT_ECHO_L
@@ -5633,7 +5633,7 @@
 231    0x1000    //TX_B_LESSCUT_RTO_ECHO
 232    0x0000    //TX_EPD_OFFSET_00
 233    0x0000    //TX_EPD_OFFST_01
-234    0x1F40    //TX_RATIO_DT_L0_TH_HIGH
+234    0x01F4    //TX_RATIO_DT_L0_TH_HIGH
 235    0x7FFF    //TX_RATIO_DT_H_TH_CUT
 236    0x7FFF    //TX_MIN_EQ_RE_EST_13
 237    0x0000    //TX_DTD_THR1_7
@@ -10958,7 +10958,7 @@
 166    0x3000    //TX_LAMBDA_CB_NLE
 167    0x4000    //TX_C_POST_FLT
 168    0x2000    //TX_GAIN_NP
-169    0x0260    //TX_SE_HOLD_N
+169    0x02C0    //TX_SE_HOLD_N
 170    0x00C8    //TX_DT_HOLD_N
 171    0x0180    //TX_DT2_HOLD_N
 172    0x6666    //TX_AEC_RESRV_0
@@ -11014,7 +11014,7 @@
 222    0x023E    //TX_ADPT_STRICT_H
 223    0x0001    //TX_RATIO_DT_L_TH_LOW
 224    0x1A98    //TX_RATIO_DT_H_TH_LOW
-225    0x2EE0    //TX_RATIO_DT_L_TH_HIGH
+225    0x0BB8    //TX_RATIO_DT_L_TH_HIGH
 226    0x5DC0    //TX_RATIO_DT_H_TH_HIGH
 227    0x0001    //TX_RATIO_DT_L0_TH
 228    0x2000    //TX_B_POST_FILT_ECHO_L
@@ -11023,7 +11023,7 @@
 231    0x1000    //TX_B_LESSCUT_RTO_ECHO
 232    0x0000    //TX_EPD_OFFSET_00
 233    0x0000    //TX_EPD_OFFST_01
-234    0x1F40    //TX_RATIO_DT_L0_TH_HIGH
+234    0x01F4    //TX_RATIO_DT_L0_TH_HIGH
 235    0x7FFF    //TX_RATIO_DT_H_TH_CUT
 236    0x7FFF    //TX_MIN_EQ_RE_EST_13
 237    0x0000    //TX_DTD_THR1_7

audio/caiman/tuning/fortemedia/HANDSET.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HANDSET
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-28 10:08:31
+#SAVE_TIME  2024-06-06 17:12:00
 
 #CASE_NAME  HANDSET-HANDSET-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -4170,7 +4170,7 @@
 121    0x199A    //RX_TDDRC_HMNC_GAIN
 122    0x0001    //RX_TDDRC_SMT_FLAG
 123    0x0CCD    //RX_TDDRC_SMT_W
-124    0x033C    //RX_TDDRC_DRC_GAIN
+124    0x03FB    //RX_TDDRC_DRC_GAIN
 38    0x001C    //RX_FDEQ_SUBNUM
 39    0x5C54    //RX_FDEQ_GAIN_0
 40    0x4A54    //RX_FDEQ_GAIN_1
@@ -4179,12 +4179,12 @@
 43    0x7A7C    //RX_FDEQ_GAIN_4
 44    0x7E78    //RX_FDEQ_GAIN_5
 45    0x7781    //RX_FDEQ_GAIN_6
-46    0x8995    //RX_FDEQ_GAIN_7
+46    0x8F97    //RX_FDEQ_GAIN_7
-47    0x9994    //RX_FDEQ_GAIN_8
+47    0x9480    //RX_FDEQ_GAIN_8
-48    0x7E6F    //RX_FDEQ_GAIN_9
+48    0x6B68    //RX_FDEQ_GAIN_9
-49    0x645D    //RX_FDEQ_GAIN_10
+49    0x5551    //RX_FDEQ_GAIN_10
-50    0x4A4A    //RX_FDEQ_GAIN_11
+50    0x333E    //RX_FDEQ_GAIN_11
-51    0x4545    //RX_FDEQ_GAIN_12
+51    0x4A45    //RX_FDEQ_GAIN_12
 52    0x454E    //RX_FDEQ_GAIN_13
 53    0x4848    //RX_FDEQ_GAIN_14
 54    0x4848    //RX_FDEQ_GAIN_15
@@ -4204,9 +4204,9 @@
 68    0x0506    //RX_FDEQ_BIN_5
 69    0x0708    //RX_FDEQ_BIN_6
 70    0x090A    //RX_FDEQ_BIN_7
-71    0x0B09    //RX_FDEQ_BIN_8
+71    0x0B0F    //RX_FDEQ_BIN_8
-72    0x0A14    //RX_FDEQ_BIN_9
+72    0x0808    //RX_FDEQ_BIN_9
-73    0x0E0D    //RX_FDEQ_BIN_10
+73    0x160D    //RX_FDEQ_BIN_10
 74    0x110E    //RX_FDEQ_BIN_11
 75    0x100D    //RX_FDEQ_BIN_12
 76    0x110A    //RX_FDEQ_BIN_13
@@ -14950,7 +14950,7 @@
 121    0x199A    //RX_TDDRC_HMNC_GAIN
 122    0x0001    //RX_TDDRC_SMT_FLAG
 123    0x0CCD    //RX_TDDRC_SMT_W
-124    0x033C    //RX_TDDRC_DRC_GAIN
+124    0x03FB    //RX_TDDRC_DRC_GAIN
 38    0x001C    //RX_FDEQ_SUBNUM
 39    0x5C54    //RX_FDEQ_GAIN_0
 40    0x4A54    //RX_FDEQ_GAIN_1
@@ -14959,12 +14959,12 @@
 43    0x7A7C    //RX_FDEQ_GAIN_4
 44    0x7E78    //RX_FDEQ_GAIN_5
 45    0x7781    //RX_FDEQ_GAIN_6
-46    0x8995    //RX_FDEQ_GAIN_7
+46    0x8F97    //RX_FDEQ_GAIN_7
-47    0x9994    //RX_FDEQ_GAIN_8
+47    0x9480    //RX_FDEQ_GAIN_8
-48    0x7E6F    //RX_FDEQ_GAIN_9
+48    0x6B68    //RX_FDEQ_GAIN_9
-49    0x645D    //RX_FDEQ_GAIN_10
+49    0x5551    //RX_FDEQ_GAIN_10
-50    0x4A4A    //RX_FDEQ_GAIN_11
+50    0x333E    //RX_FDEQ_GAIN_11
-51    0x4545    //RX_FDEQ_GAIN_12
+51    0x4A45    //RX_FDEQ_GAIN_12
 52    0x454E    //RX_FDEQ_GAIN_13
 53    0x4848    //RX_FDEQ_GAIN_14
 54    0x4848    //RX_FDEQ_GAIN_15
@@ -14984,9 +14984,9 @@
 68    0x0506    //RX_FDEQ_BIN_5
 69    0x0708    //RX_FDEQ_BIN_6
 70    0x090A    //RX_FDEQ_BIN_7
-71    0x0B09    //RX_FDEQ_BIN_8
+71    0x0B0F    //RX_FDEQ_BIN_8
-72    0x0A14    //RX_FDEQ_BIN_9
+72    0x0808    //RX_FDEQ_BIN_9
-73    0x0E0D    //RX_FDEQ_BIN_10
+73    0x160D    //RX_FDEQ_BIN_10
 74    0x110E    //RX_FDEQ_BIN_11
 75    0x100D    //RX_FDEQ_BIN_12
 76    0x110A    //RX_FDEQ_BIN_13

audio/caiman/tuning/waves/waves_config.ini

@@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatIncrement=8
 
 [CUSTOM_ACTION_260]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
+CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
+CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
-CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
+CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
-CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
+CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
 # Action 260 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
 # - audio_devices_t : current active device
-# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
+# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
 # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
 # - sound_usage_t: 0 - Music, 1 - Movie

audio/komodo/aidl_config/mixer_paths_aidl.xml

@@ -1297,6 +1297,10 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
@@ -1331,6 +1335,10 @@
     <path name="microphones (VOICE)" />
   </path>
 
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
+  </path>
+
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>

audio/komodo/tuning/fortemedia/BLUETOOTH.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  BLUETOOTH
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-27 17:37:13
+#SAVE_TIME  2024-06-06 17:28:27
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -3570,7 +3570,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x11C8    //TX_TDDRC_DRC_GAIN
+866    0x0EF6    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -6265,7 +6265,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -11655,7 +11655,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH

audio/komodo/tuning/fortemedia/HANDSET.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HANDSET
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-27 17:37:07
+#SAVE_TIME  2024-06-06 17:28:25
 
 #CASE_NAME  HANDSET-HANDSET-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX

audio/komodo/tuning/fortemedia/HANDSFREE.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HANDSFREE
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-27 17:37:06
+#SAVE_TIME  2024-06-06 17:28:24
 
 #CASE_NAME  HANDSFREE-HANDSFREE-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -3570,7 +3570,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x11C8    //TX_TDDRC_DRC_GAIN
+866    0x0EF6    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -6265,7 +6265,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -11655,7 +11655,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -17045,7 +17045,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -22435,7 +22435,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -27825,7 +27825,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -28202,7 +28202,7 @@
 108    0x7FFF    //RX_FDDRC_SLANT_1_2
 109    0x7FFF    //RX_FDDRC_SLANT_1_3
 110    0x0000    //RX_FDDRC_RESRV_0
-129    0x000D    //RX_SPK_VOL
+129    0x0009    //RX_SPK_VOL
 130    0x0000    //RX_VOL_RESRV_0
 #VOL    1
 6    0x6000    //RX_TDDRC_ALPHA_UP_1
@@ -28301,7 +28301,7 @@
 108    0x7FFF    //RX_FDDRC_SLANT_1_2
 109    0x7FFF    //RX_FDDRC_SLANT_1_3
 110    0x0000    //RX_FDDRC_RESRV_0
-129    0x0014    //RX_SPK_VOL
+129    0x0010    //RX_SPK_VOL
 130    0x0000    //RX_VOL_RESRV_0
 #VOL    2
 6    0x6000    //RX_TDDRC_ALPHA_UP_1
@@ -28400,7 +28400,7 @@
 108    0x7FFF    //RX_FDDRC_SLANT_1_2
 109    0x7FFF    //RX_FDDRC_SLANT_1_3
 110    0x0000    //RX_FDDRC_RESRV_0
-129    0x001E    //RX_SPK_VOL
+129    0x001B    //RX_SPK_VOL
 130    0x0000    //RX_VOL_RESRV_0
 #VOL    3
 6    0x6000    //RX_TDDRC_ALPHA_UP_1
@@ -29053,7 +29053,7 @@
 265    0x7FFF    //RX_FDDRC_SLANT_1_2
 266    0x7FFF    //RX_FDDRC_SLANT_1_3
 267    0x0000    //RX_FDDRC_RESRV_0
-286    0x000D    //RX_SPK_VOL
+286    0x0009    //RX_SPK_VOL
 287    0x0000    //RX_VOL_RESRV_0
 #VOL    1
 163    0x6000    //RX_TDDRC_ALPHA_UP_1
@@ -29152,7 +29152,7 @@
 265    0x7FFF    //RX_FDDRC_SLANT_1_2
 266    0x7FFF    //RX_FDDRC_SLANT_1_3
 267    0x0000    //RX_FDDRC_RESRV_0
-286    0x0014    //RX_SPK_VOL
+286    0x0010    //RX_SPK_VOL
 287    0x0000    //RX_VOL_RESRV_0
 #VOL    2
 163    0x6000    //RX_TDDRC_ALPHA_UP_1
@@ -29251,7 +29251,7 @@
 265    0x7FFF    //RX_FDDRC_SLANT_1_2
 266    0x7FFF    //RX_FDDRC_SLANT_1_3
 267    0x0000    //RX_FDDRC_RESRV_0
-286    0x001E    //RX_SPK_VOL
+286    0x001B    //RX_SPK_VOL
 287    0x0000    //RX_VOL_RESRV_0
 #VOL    3
 163    0x6000    //RX_TDDRC_ALPHA_UP_1

audio/komodo/tuning/fortemedia/HEADSET.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HEADSET
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-27 17:37:09
+#SAVE_TIME  2024-06-06 17:28:21
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -30520,7 +30520,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x11C8    //TX_TDDRC_DRC_GAIN
+866    0x0EF6    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -33215,7 +33215,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -38605,7 +38605,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -70945,7 +70945,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x11C8    //TX_TDDRC_DRC_GAIN
+866    0x0EF6    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -73640,7 +73640,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -79030,7 +79030,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x13F4    //TX_TDDRC_DRC_GAIN
+866    0x10CA    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH

audio/komodo/tuning/waves/waves_config.ini

@@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatIncrement=8
 
 [CUSTOM_ACTION_260]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
+CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
+CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
-CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
+CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
-CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
+CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
 # Action 260 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
 # - audio_devices_t : current active device
-# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
+# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
 # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
 # - sound_usage_t: 0 - Music, 1 - Movie

audio/tokay/aidl_config/mixer_paths_aidl.xml

@@ -1297,6 +1297,10 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="microphones (VOICE)" />
+  </path>
+
   <path name="microphones (VOICE_RECOGNITION)">
     <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
@@ -1331,6 +1335,10 @@
     <path name="microphones (VOICE)" />
   </path>
 
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
+    <path name="back-microphones (VOICE)" />
+  </path>
+
   <path name="back-microphones (CAMCORDER)">
     <path name="microphones (CAMCORDER)" />
   </path>

audio/tokay/tuning/fortemedia/BLUETOOTH.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  BLUETOOTH
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-27 18:20:00
+#SAVE_TIME  2024-06-06 17:50:42
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -3570,7 +3570,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x1844    //TX_TDDRC_DRC_GAIN
+866    0x1561    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -6265,7 +6265,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -11655,7 +11655,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH

audio/tokay/tuning/fortemedia/HANDSET.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HANDSET
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-27 18:19:59
+#SAVE_TIME  2024-06-06 17:50:41
 
 #CASE_NAME  HANDSET-HANDSET-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX

audio/tokay/tuning/fortemedia/HANDSFREE.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HANDSFREE
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-27 18:19:58
+#SAVE_TIME  2024-06-06 17:50:40
 
 #CASE_NAME  HANDSFREE-HANDSFREE-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -3570,7 +3570,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x1844    //TX_TDDRC_DRC_GAIN
+866    0x1561    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -6265,7 +6265,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -11655,7 +11655,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -17045,7 +17045,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -22435,7 +22435,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -27825,7 +27825,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH

audio/tokay/tuning/fortemedia/HEADSET.mods

@@ -3,7 +3,7 @@
 #EXPORT_FLAG  HEADSET
 #PARAM_MODE   FULL
 #SAVE_MODE  3
-#SAVE_TIME  2024-05-27 18:19:56
+#SAVE_TIME  2024-06-06 17:50:38
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
 #PARAM_TYPE  TX+2RX
@@ -30520,7 +30520,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x1844    //TX_TDDRC_DRC_GAIN
+866    0x1561    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -33215,7 +33215,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -38605,7 +38605,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -70945,7 +70945,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x1844    //TX_TDDRC_DRC_GAIN
+866    0x1561    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -73640,7 +73640,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH
@@ -79030,7 +79030,7 @@
 863    0x199A    //TX_TDDRC_HMNC_GAIN
 864    0x0000    //TX_TDDRC_SMT_FLAG
 865    0x0CCD    //TX_TDDRC_SMT_W
-866    0x188C    //TX_TDDRC_DRC_GAIN
+866    0x15A1    //TX_TDDRC_DRC_GAIN
 867    0x7FFF    //TX_TDDRC_LMT_THRD
 868    0x0000    //TX_TDDRC_LMT_ALPHA
 869    0x0000    //TX_TFMASKLTH

audio/tokay/tuning/waves/waves_config.ini

@@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
 #AudioFormatIncrement=8
 
 [CUSTOM_ACTION_260]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
+CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
+CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
+CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
-CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
+CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
-CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
+CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
-CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
+CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
-CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
+CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
-CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
+CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
 # Action 260 parameters:  audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
 # - audio_devices_t : current active device
-# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
+# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
 # - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
 # - sound_usage_t: 0 - Music, 1 - Movie

caiman/overlay/frameworks/base/core/res/res/values/config.xml

@@ -202,7 +202,7 @@
 
          Note: If the display supports multiple resolutions, please define the path config based on
          the highest resolution so that it can be scaled correctly in each resolution. -->
-    <string name="config_mainDisplayShape">M 1279.97,230.06 V 2624.26 M 0,229.82 V 2624.02 m 230.23,231.94 h 817.56 M 230.18,0.03 H 1047.83 M 1049.65,2855.93 c 40.06,-0.12 81.47,1.06 119.48,-13.6 43.5,-15.91 79.36,-51.02 96.08,-94.17 16.07,-39.24 14.57,-82.34 14.75,-123.9 m -0.07,-2394.27 c -0.12,-40 1.06,-81.34 -13.62,-119.3 C 1250.34,67.26 1215.17,31.46 1171.96,14.76 1132.65,-1.29 1089.49,0.21 1047.86,0.03 M 230.35,2855.72 c -40.06,-0.12 -81.47,1.06 -119.48,-13.6 -43.5,-15.91 -79.36,-51.03 -96.08,-94.17 -16.07,-39.24 -14.57,-82.34 -14.75,-123.9 m 0,-2394.06 C 0.15,189.99 -1.02,148.65 13.65,110.69 29.59,67.26 64.76,31.46 107.98,14.76 147.28,-1.29 190.44,0.21 232.07,0.03 z</string>
+    <string name="config_mainDisplayShape">m 0.003,226.705 c 0,0 -0.005,-3.3 0,-4.95 0.011,-3.988 0.044,-7.976 0.069,-11.963 0.021,-3.346 0.01,-6.693 0.069,-10.038 0.114,-6.488 0.231,-12.977 0.55,-19.458 0.225,-4.567 0.53,-9.131 0.963,-13.682 0.547,-5.745 1.173,-11.487 2.063,-17.189 0.785,-5.027 1.705,-10.04 2.888,-14.989 1.374,-5.75 2.948,-11.465 4.882,-17.051 2.479,-7.159 5.288,-14.223 8.596,-21.039 2.841,-5.854 6.101,-11.514 9.627,-16.983 3.565,-5.529 7.494,-10.828 11.621,-15.951 2.424,-3.009 5.011,-5.89 7.702,-8.663 3.952,-4.072 8.09,-7.971 12.378,-11.688 2.699,-2.34 5.513,-4.55 8.389,-6.669 3.506,-2.583 7.076,-5.093 10.796,-7.357 6.098,-3.711 12.344,-7.221 18.842,-10.176 7.91,-3.597 16.079,-6.68 24.412,-9.144 8.485,-2.509 17.181,-4.345 25.924,-5.707 10.554,-1.644 21.242,-2.364 31.907,-2.956 9.866,-0.548 19.757,-0.442 29.638,-0.55 6.968,-0.076 13.936,-0.057 20.905,-0.069 274.372,-0.451 548.746,-0.686 823.117,0 4.584,0.011 9.169,0.057 13.753,0.069 1.559,0.004 3.117,-0.007 4.676,0 2.567,0.011 5.135,0.03 7.702,0.069 3.255,0.049 6.511,0.087 9.765,0.206 6.17,0.226 12.341,0.499 18.498,0.963 4.892,0.368 9.783,0.805 14.647,1.444 4.906,0.644 9.791,1.458 14.647,2.406 4.175,0.815 8.327,1.758 12.447,2.819 2.796,0.72 5.577,1.506 8.321,2.406 5.106,1.676 10.158,3.528 15.128,5.569 3.331,1.368 6.616,2.854 9.833,4.469 4.538,2.278 9.006,4.711 13.341,7.357 3.82,2.332 7.535,4.843 11.14,7.494 3.835,2.821 7.533,5.831 11.14,8.938 2.507,2.16 4.935,4.413 7.289,6.738 2.537,2.507 4.992,5.1 7.358,7.769 2.548,2.874 4.999,5.838 7.358,8.869 1.864,2.395 3.655,4.848 5.364,7.357 1.926,2.827 3.755,5.722 5.501,8.663 1.86,3.131 3.616,6.325 5.295,9.557 1.257,2.42 2.479,4.861 3.576,7.357 2.161,4.917 4.149,9.916 5.914,14.989 1.534,4.41 2.827,8.903 4.057,13.407 0.79,2.89 1.52,5.799 2.132,8.732 1.012,4.85 1.846,9.74 2.544,14.645 0.76,5.342 1.323,10.713 1.788,16.089 0.415,4.804 0.687,9.621 0.894,14.439 0.247,5.749 0.319,11.504 0.413,17.258 0.087,5.317 0.115,10.634 0.138,15.951 0.012,2.865 0,5.73 0,8.594 v 7.563 c 0,0 0,1595.816 0,2393.724 0,4.4 0.013,8.801 0,13.201 -0.012,3.805 -0.025,7.609 -0.069,11.413 -0.062,5.295 -0.123,10.59 -0.275,15.883 -0.082,2.866 -0.179,5.732 -0.344,8.595 -0.404,6.998 -0.892,13.994 -1.582,20.97 -0.204,2.068 -0.453,4.132 -0.756,6.188 -0.706,4.786 -1.503,9.562 -2.475,14.301 -0.777,3.785 -1.64,7.556 -2.682,11.276 -1.708,6.1 -3.616,12.153 -5.845,18.083 -1.448,3.854 -3.081,7.643 -4.882,11.345 -3.016,6.197 -6.298,12.277 -9.902,18.152 -2.267,3.695 -4.727,7.28 -7.358,10.726 -4.174,5.467 -8.645,10.718 -13.34,15.745 -2.356,2.523 -4.891,4.876 -7.427,7.219 -1.658,1.532 -3.359,3.019 -5.089,4.469 -1.912,1.603 -3.849,3.178 -5.845,4.675 -3.698,2.774 -7.472,5.453 -11.346,7.976 -2.309,1.504 -4.687,2.901 -7.083,4.263 -2.487,1.414 -5.009,2.769 -7.564,4.057 -2.875,1.449 -5.776,2.852 -8.733,4.125 -4,1.722 -8.053,3.33 -12.171,4.744 -5.611,1.927 -11.283,3.713 -17.054,5.088 -8.564,2.041 -17.26,3.566 -25.993,4.675 -8.528,1.083 -17.132,1.495 -25.718,1.925 -4.488,0.225 -8.984,0.263 -13.478,0.344 -6.624,0.119 -13.248,0.172 -19.873,0.206 -5.111,0.026 -10.223,0 -15.335,0 -272.126,0 -544.252,0 -816.378,0 -4.561,0 -9.123,0.033 -13.684,0 -1.605,-0.012 -3.209,-0.051 -4.814,-0.069 -5.776,-0.064 -11.553,-0.034 -17.329,-0.137 -4.127,-0.074 -8.254,-0.168 -12.378,-0.344 -4.794,-0.204 -9.59,-0.426 -14.372,-0.825 -5.032,-0.42 -10.057,-0.962 -15.06,-1.65 -4.028,-0.554 -8.044,-1.208 -12.034,-1.994 -4.545,-0.895 -9.086,-1.847 -13.547,-3.094 -7.071,-1.977 -14.084,-4.226 -20.905,-6.944 -5.877,-2.342 -11.591,-5.1 -17.191,-8.044 -3.81,-2.003 -7.508,-4.222 -11.14,-6.532 -2.559,-1.627 -5.063,-3.346 -7.495,-5.157 -4.459,-3.32 -8.849,-6.75 -12.997,-10.451 -4.354,-3.884 -8.49,-8.019 -12.446,-12.307 -2.68,-2.905 -5.248,-5.923 -7.633,-9.076 -4.361,-5.764 -8.443,-11.753 -12.171,-17.945 -2.623,-4.357 -4.925,-8.904 -7.152,-13.476 -1.186,-2.435 -2.282,-4.915 -3.301,-7.425 -1.772,-4.367 -3.46,-8.776 -4.882,-13.27 -1.933,-6.106 -3.572,-12.31 -4.951,-18.564 -1.173,-5.317 -2.039,-10.7 -2.819,-16.089 -0.635,-4.383 -1.119,-8.789 -1.513,-13.201 -0.447,-5.009 -0.736,-10.033 -0.963,-15.057 -0.236,-5.245 -0.314,-10.496 -0.413,-15.745 -0.077,-4.102 -0.105,-8.205 -0.138,-12.307 -0.039,-4.973 -0.057,-9.947 -0.069,-14.92 -0.006,-2.521 0,-7.563 0,-7.563 z</string>
 
     <!-- Boolean indicating whether allow sending null to modem to clear the previous initial attach
          data profile -->

caiman/overlay/frameworks/base/core/res/res/values/config_telephony.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Boolean indicating whether to enable persistent logging via DropBoxManager.
+         Used in persisting SOS/emergency related log messages. -->
+    <bool name="config_dropboxmanager_persistent_logging_enabled" translatable="false">true</bool>
+</resources>

caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml

@@ -73,4 +73,7 @@
 
     <!--  Whether to use a machine learning model for back gesture falsing. -->
     <bool name="config_useBackGestureML">false</bool>
+
+    <!-- Whether to use deadzone with nav bar -->
+    <bool name="config_useDeadZone">false</bool>
 </resources>

caiman/overlay/packages/services/Telephony/res/values/config.xml

@@ -17,6 +17,44 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
+    <!-- Dynamic routing of emergency calls: trying normal routing if it's available.
+         Otherwise, emergency routing. -->
+    <bool name="dynamic_routing_emergency_enabled">true</bool>
+
+    <!-- Array of countries that the dynamic routing is supported.
+         Values should be ISO3166 country codes in lowercase. -->
+    <string-array name="config_countries_dynamic_routing_emergency_enabled"
+            translatable="false">
+        <item>in</item>
+        <item>il</item>
+        <item>tw</item>
+        <item>sg</item>
+        <item>ch</item>
+        <item>sk</item>
+        <item>pl</item>
+        <item>si</item>
+        <item>ba</item>
+    </string-array>
+
+    <!-- Array of emergency numbers for dynamic routing.
+         Values are the tuples of Country ISO, MNC, and numbers. -->
+    <string-array name="config_dynamic_routing_emergency_numbers"
+      translatable="false">
+        <item>in,,101,102,103,108</item>
+        <item>il,,101,102</item>
+        <item>tw,,110,119</item>
+        <item>sg,,995</item>
+        <item>ch,,1414</item>
+        <item>gp,,115,119,191,196,197,116000,116111,116117</item>
+        <item>sk,,159</item>
+        <item>pl,01,984,985,997,998,999</item>
+        <item>pl,06,984,985,997,998,999</item>
+        <item>pl,,986,987,989,991,992,993,994,995,996</item>
+        <item>re,,115,119,191,196,197,116000,116111,116117</item>
+        <item>si,,113</item>
+        <item>ba,,122,123,124</item>
+    </string-array>
+
     <!-- The component name(a flattened ComponentName string) for the telephony domain selection
          service. The device should fallback to the modem based domain selection architecture
          if this is not configured. -->

caiman/uwb/calibration.conf

@@ -1,12 +1,12 @@
 # common calibration file
-ant0.ch5.ant_delay=31:40:00:00
+ant0.ch5.ant_delay=37:40:00:00
-ant0.ch9.ant_delay=15:40:00:00
+ant0.ch9.ant_delay=2F:40:00:00
 
 ant1.ch5.ant_delay=10:40:00:00
 ant1.ch9.ant_delay=10:40:00:00
 
-ant2.ch5.ant_delay=3F:40:00:00
+ant2.ch5.ant_delay=19:40:00:00
-ant2.ch9.ant_delay=3B:40:00:00
+ant2.ch9.ant_delay=4E:40:00:00
 
 ant3.ch5.ant_delay=10:40:00:00
 ant3.ch9.ant_delay=10:40:00:00
@@ -19,17 +19,17 @@ xtal_trim=0x30
 dual_rx_auto.accum_period=0x00
 
 # Increase TX power of 0.25 dB
-ant0.ch5.pa_gain_offset=0x00
+# ant0.ch5.pa_gain_offset=0x01
-ant0.ch9.pa_gain_offset=0x00
+# ant0.ch9.pa_gain_offset=0x01
 
 # Decrease TX power of -0.25 dB
-ant1.ch5.pa_gain_offset=0x00
+# ant1.ch5.pa_gain_offset=0xFF
-ant1.ch9.pa_gain_offset=0x00
+# ant1.ch9.pa_gain_offset=0xFF
 
 # Increase TX power of 0.25 dB
-ant2.ch5.pa_gain_offset=0x00
+# ant2.ch5.pa_gain_offset=0x01
-ant2.ch9.pa_gain_offset=0x00
+# ant2.ch9.pa_gain_offset=0x01
 
 # Decrease TX power of -0.25 dB
-ant3.ch5.pa_gain_offset=0x00
+# ant3.ch5.pa_gain_offset=0xFF
-ant3.ch9.pa_gain_offset=0x00
+# ant3.ch9.pa_gain_offset=0xFF

device-caiman.mk

@@ -275,24 +275,11 @@ PRODUCT_SOONG_NAMESPACES += \
     device/google/caimito/caiman/uwb
 
 # Location
-# iGNSS
-# gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/caiman
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
-# eGNSS
+# For GPS property
-# SDK build system
+PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true
-$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
-include device/google/gs-common/gps/brcm/device.mk
-PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/caiman
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT)
-PRODUCT_PACKAGES += \
-	gps.cer \
-	gps.xml \
-	scd.conf \
-	lhd.conf
 
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1

device-caimito-common.mk

@@ -45,6 +45,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	$(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-zuma.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-proto.json
 
+# Telephony Satellite Feature
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.telephony.satellite.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.satellite.xml
+
 # Battery Mitigation Config
 ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay))
 ifeq (,$(TARGET_VENDOR_BATTERY_MITIGATION_CONFIG_PATH))

device-komodo.mk

@@ -290,24 +290,11 @@ PRODUCT_SOONG_NAMESPACES += \
     device/google/caimito/komodo/uwb
 
 # Location
-# iGNSS
-# gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/komodo
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
-# eGNSS
+# For GPS property
-# SDK build system
+PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true
-$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
-include device/google/gs-common/gps/brcm/device.mk
-PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/komodo
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT)
-PRODUCT_PACKAGES += \
-	gps.cer \
-	gps.xml \
-	scd.conf \
-	lhd.conf
 
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1

device-ripcurrent24.mk

@@ -217,25 +217,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
 # Location
-# iGNSS
-# gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrent24
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
-# eGNSS
+# For GPS property
-# SDK build system
+PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true
-$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
-include device/google/gs-common/gps/brcm/device.mk
-
-PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrent24
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT)
-PRODUCT_PACKAGES += \
-	gps.cer \
-	gps.xml \
-	scd.conf \
-	lhd.conf
 
 PRODUCT_VENDOR_PROPERTIES += \
 	vendor.disable.thermal.control=1 \

device-ripcurrentpro.mk

@@ -219,24 +219,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
 # Location
-# iGNSS
-# gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrentpro
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
-# eGNSS
+# For GPS property
-# SDK build system
+PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true
-$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
-include device/google/gs-common/gps/brcm/device.mk
-PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrentpro
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT)
-PRODUCT_PACKAGES += \
-	gps.cer \
-	gps.xml \
-	scd.conf \
-	lhd.conf
 
 PRODUCT_VENDOR_PROPERTIES += \
 	persist.device_config.configuration.disable_rescue_party=true

device-tokay.mk

@@ -264,24 +264,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
 
 # Location
-# iGNSS
-# gps.cfg
 PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay
 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))
 PRODUCT_PACKAGES += gps.cfg
-# eGNSS
+# For GPS property
-# SDK build system
+PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true
-$(call soong_config_set, include_libsitril_gps_wifi, board_without_radio, $(BOARD_WITHOUT_RADIO))
-include device/google/gs-common/gps/brcm/device.mk
-PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf ?= $(TARGET_BUILD_VARIANT)
-PRODUCT_PACKAGES += \
-	gps.cer \
-	gps.xml \
-	scd.conf \
-	lhd.conf
 
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1

factory_caiman.mk

@@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
 # Location
-# iGNSS
 PRODUCT_PACKAGES += \
 	sctd \
 	spad \
@@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \
 	spad.json \
 	swcnd.json \
 	android.hardware.gnss@2.1-impl
-# eGNSS
-# Override to factory SDK
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += sdkv1
-SOONG_CONFIG_gpssdk_sdkv1 := true
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsmcuversion
-SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT)
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf := factory
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool factory_lwis_client_test

factory_komodo.mk

@@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
 # Location
-# iGNSS
 PRODUCT_PACKAGES += \
 	sctd \
 	spad \
@@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \
 	spad.json \
 	swcnd.json \
 	android.hardware.gnss@2.1-impl
-# eGNSS
-# Override to factory SDK
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += sdkv1
-SOONG_CONFIG_gpssdk_sdkv1 := true
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsmcuversion
-SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT)
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf := factory
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool factory_lwis_client_test

factory_ripcurrent24.mk

@@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
 # Location
-# iGNSS
 PRODUCT_PACKAGES += \
 	sctd \
 	spad \
@@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \
 	spad.json \
 	swcnd.json \
 	android.hardware.gnss@2.1-impl
-# eGNSS
-# Override to factory SDK
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += sdkv1
-SOONG_CONFIG_gpssdk_sdkv1 := true
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsmcuversion
-SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT)
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf := factory
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool fatp_tk4_front_hat_tool

factory_ripcurrentpro.mk

@@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
 # Location
-# iGNSS
 PRODUCT_PACKAGES += \
 	sctd \
 	spad \
@@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \
 	spad.json \
 	swcnd.json \
 	android.hardware.gnss@2.1-impl
-# eGNSS
-# Override to factory SDK
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += sdkv1
-SOONG_CONFIG_gpssdk_sdkv1 := true
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsmcuversion
-SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT)
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf := factory
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool fatp_tk4_front_hat_tool

factory_tokay.mk

@@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
 # Location
-# iGNSS
 PRODUCT_PACKAGES += \
 	sctd \
 	spad \
@@ -43,17 +42,6 @@ PRODUCT_PACKAGES += \
 	spad.json \
 	swcnd.json \
 	android.hardware.gnss@2.1-impl
-# eGNSS
-# Override to factory SDK
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += sdkv1
-SOONG_CONFIG_gpssdk_sdkv1 := true
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsmcuversion
-SOONG_CONFIG_gpssdk_gpsmcuversion := gpsv1_$(TARGET_BUILD_VARIANT)
-SOONG_CONFIG_NAMESPACES += gpssdk
-SOONG_CONFIG_gpssdk += gpsconf
-SOONG_CONFIG_gpssdk_gpsconf := factory
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_tk4_front_hat_tool factory_lwis_client_test

komodo/overlay/frameworks/base/core/res/res/values/config.xml

@@ -202,7 +202,7 @@
 
          Note: If the display supports multiple resolutions, please define the path config based on
          the highest resolution so that it can be scaled correctly in each resolution. -->
-    <string name="config_mainDisplayShape">M 1343.13,226.31 V 2764.73 M 0.09,226.4 V 2764.83 M 224.16,2991.91 H 1118.97 M 224.65,0 h 894.8 m -0.3,2991.7 c 36.66,-0.06 74.28,1.14 109.5,-10.8 22.52,-7.01 43.12,-19.74 60.41,-35.82 17.04,-15.82 30.34,-35.6 38.92,-57.3 5.5,-13.82 9.58,-28.23 11.5,-43.02 4.09,-26.35 3.31,-53.26 3.46,-79.85 m 0.96,-2538.61 c -0.06,-37.05 1.13,-75.08 -10.68,-110.69 -6.93,-22.76 -19.53,-43.59 -35.43,-61.06 -15.65,-17.23 -35.21,-30.67 -56.68,-39.34 -13.67,-5.56 -27.93,-9.68 -42.56,-11.62 -26.06,-4.14 -52.69,-3.34 -78.99,-3.5 M 223.97,2991.7 c -36.66,-0.06 -74.28,1.14 -109.5,-10.8 -22.52,-7.01 -43.12,-19.75 -60.41,-35.81 -17.04,-15.82 -30.34,-35.6 -38.92,-57.3 -5.5,-13.82 -9.58,-28.23 -11.5,-43.02 -4.09,-26.35 -3.31,-53.26 -3.46,-79.85 m 0,-2538.61 C 0.25,189.25 -0.94,151.23 10.87,115.62 17.8,92.85 30.4,72.03 46.3,54.55 61.95,37.33 81.52,23.88 102.98,15.21 116.65,9.65 130.91,5.53 145.55,3.59 c 26.06,-4.14 52.69,-3.34 78.99,-3.5 z</string>
+    <string name="config_mainDisplayShape">M 0,223.8 V 199 187.5 174.1 l 1.915,-23 3.829,-17.2 3.829,-17.2 5.747,-17.22 5.74,-11.48 5.74,-9.56 5.75,-7.65 3.83,-5.75 11.48,-13.39 3.83,-3.82 11.49,-9.56 13.4,-9.58 9.57,-5.73 19.15,-9.57 17.2,-5.738 17.3,-3.825 21,-1.914 L 176.1,0 h 15.4 17.2 19.1 896.2 15 6 8 11 6 l 9,1.913 h 12 l 9,1.914 12,1.912 15,3.826 10,3.825 7,3.82 12,5.75 8,3.83 9,7.65 15,9.56 16,17.22 11,15.3 8,11.48 6,13.4 5,13.4 6,21 2,17.3 v 7.6 l 2,13.4 v 19.1 19.2 15.2 2540.4 6 4 9 8 12 13 l -2,15 v 10 l -6,26 -5,16 -6,13 -10,15 -7,11 -10,13 -11,11 -14,9 -23,14 -15,6 -23,7 -14,2 -30,4 h -23 -12 -7 -10 -888.2 -11.5 -9.5 -9.6 -5.7 -13.4 l -19.2,-2 -11.5,-2 h -7.6 l -17.3,-5 -15.3,-4 -19.13,-10 -15.32,-10 -19.14,-15 -13.4,-11 -9.58,-16 -11.48,-19 -7.66,-19 L 5.744,2858 3.829,2847 0,2827 v -24 -20 -18 z</string>
 
     <!-- Boolean indicating whether allow sending null to modem to clear the previous initial attach
          data profile -->

komodo/overlay/frameworks/base/core/res/res/values/config_telephony.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Boolean indicating whether to enable persistent logging via DropBoxManager.
+         Used in persisting SOS/emergency related log messages. -->
+    <bool name="config_dropboxmanager_persistent_logging_enabled" translatable="false">true</bool>
+</resources>

komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml

@@ -73,4 +73,7 @@
 
     <!--  Whether to use a machine learning model for back gesture falsing. -->
     <bool name="config_useBackGestureML">false</bool>
+
+    <!-- Whether to use deadzone with nav bar -->
+    <bool name="config_useDeadZone">false</bool>
 </resources>

komodo/overlay/packages/services/Telephony/res/values/config.xml

@@ -17,6 +17,44 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
+    <!-- Dynamic routing of emergency calls: trying normal routing if it's available.
+         Otherwise, emergency routing. -->
+    <bool name="dynamic_routing_emergency_enabled">true</bool>
+
+    <!-- Array of countries that the dynamic routing is supported.
+         Values should be ISO3166 country codes in lowercase. -->
+    <string-array name="config_countries_dynamic_routing_emergency_enabled"
+            translatable="false">
+        <item>in</item>
+        <item>il</item>
+        <item>tw</item>
+        <item>sg</item>
+        <item>ch</item>
+        <item>sk</item>
+        <item>pl</item>
+        <item>si</item>
+        <item>ba</item>
+    </string-array>
+
+    <!-- Array of emergency numbers for dynamic routing.
+         Values are the tuples of Country ISO, MNC, and numbers. -->
+    <string-array name="config_dynamic_routing_emergency_numbers"
+      translatable="false">
+        <item>in,,101,102,103,108</item>
+        <item>il,,101,102</item>
+        <item>tw,,110,119</item>
+        <item>sg,,995</item>
+        <item>ch,,1414</item>
+        <item>gp,,115,119,191,196,197,116000,116111,116117</item>
+        <item>sk,,159</item>
+        <item>pl,01,984,985,997,998,999</item>
+        <item>pl,06,984,985,997,998,999</item>
+        <item>pl,,986,987,989,991,992,993,994,995,996</item>
+        <item>re,,115,119,191,196,197,116000,116111,116117</item>
+        <item>si,,113</item>
+        <item>ba,,122,123,124</item>
+    </string-array>
+
     <!-- The component name(a flattened ComponentName string) for the telephony domain selection
          service. The device should fallback to the modem based domain selection architecture
          if this is not configured. -->

komodo/uwb/calibration.conf

@@ -1,12 +1,12 @@
 # common calibration file
-ant0.ch5.ant_delay=57:40:00:00
+ant0.ch5.ant_delay=3C:40:00:00
-ant0.ch9.ant_delay=4B:40:00:00
+ant0.ch9.ant_delay=46:40:00:00
 
 ant1.ch5.ant_delay=10:40:00:00
 ant1.ch9.ant_delay=10:40:00:00
 
 ant2.ch5.ant_delay=3D:40:00:00
-ant2.ch9.ant_delay=4D:40:00:00
+ant2.ch9.ant_delay=48:40:00:00
 
 ant3.ch5.ant_delay=10:40:00:00
 ant3.ch9.ant_delay=10:40:00:00
@@ -19,17 +19,17 @@ xtal_trim=0x30
 dual_rx_auto.accum_period=0x00
 
 # Increase TX power of 0.25 dB
-ant0.ch5.pa_gain_offset=0x00
+# ant0.ch5.pa_gain_offset=0x01
-ant0.ch9.pa_gain_offset=0x00
+# ant0.ch9.pa_gain_offset=0x01
 
 # Decrease TX power of -0.25 dB
-ant1.ch5.pa_gain_offset=0x00
+# ant1.ch5.pa_gain_offset=0xFF
-ant1.ch9.pa_gain_offset=0x00
+# ant1.ch9.pa_gain_offset=0xFF
 
 # Increase TX power of 0.25 dB
-ant2.ch5.pa_gain_offset=0x00
+# ant2.ch5.pa_gain_offset=0x01
-ant2.ch9.pa_gain_offset=0x00
+# ant2.ch9.pa_gain_offset=0x01
 
 # Decrease TX power of -0.25 dB
-ant3.ch5.pa_gain_offset=0x00
+# ant3.ch5.pa_gain_offset=0xFF
-ant3.ch9.pa_gain_offset=0x00
+# ant3.ch9.pa_gain_offset=0xFF

location/caiman/Android.bp

@@ -5,7 +5,7 @@ package {
 }
 
 soong_config_module_type {
-    name: "ignss_prebuilt_etc",
+    name: "gnss_prebuilt_etc",
     module_type: "prebuilt_etc",
     config_namespace: "gpssdk",
     variables: [
@@ -25,7 +25,7 @@ soong_config_string_variable {
     ],
 }
 
-ignss_prebuilt_etc {
+gnss_prebuilt_etc {
     name: "gps.cfg",
     soong_config_variables: {
         buildtype: {
@@ -46,107 +46,3 @@ ignss_prebuilt_etc {
     relative_install_path: "gnss",
     vendor: true,
 }
-
-soong_config_module_type {
-    name: "egnss_prebuilt_etc",
-    module_type: "prebuilt_etc",
-    config_namespace: "gpssdk",
-    variables: [
-        "gpsconf",
-    ],
-    properties: [
-        "src",
-    ],
-}
-
-soong_config_string_variable {
-    name: "gpsconf",
-    values: [
-        "factory",
-        "user",
-        "userdebug",
-        "eng",
-    ],
-}
-
-prebuilt_etc {
-    name: "gps.cer",
-    src: "gps.cer",
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "gps.xml",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/gps.xml",
-            },
-            userdebug: {
-                src: "userdebug/gps.xml",
-            },
-            eng: {
-                src: "userdebug/gps.xml",
-            },
-            factory: {
-                src: "factory/gps.xml",
-            },
-            conditions_default: {
-                src: "user/gps.xml",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "lhd.conf",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/lhd.conf",
-            },
-            userdebug: {
-                src: "userdebug/lhd.conf",
-            },
-            eng: {
-                src: "userdebug/lhd.conf",
-            },
-            factory: {
-                src: "factory/lhd.conf",
-            },
-            conditions_default: {
-                src: "user/lhd.conf",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "scd.conf",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/scd.conf",
-            },
-            userdebug: {
-                src: "userdebug/scd.conf",
-            },
-            eng: {
-                src: "userdebug/scd.conf",
-            },
-            factory: {
-                src: "factory/scd.conf",
-            },
-            conditions_default: {
-                src: "user/scd.conf",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}

location/caiman/factory/gps.xml

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="true"
-       Log="JAVA"
-       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="true"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="true"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="2"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/caiman/factory/lhd.conf

@@ -1,33 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/caiman/factory/scd.conf

@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

location/caiman/gps.cer

@@ -1,161 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
-MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
-2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
-1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
-q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
-tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
-vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
-5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
-1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
-NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
-Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
-8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
-pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx
-CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH
-Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV
-BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz
-dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF
-A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR
-44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk
-yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL
-66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6
-rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ
-oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp
-C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7
-tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/
-yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/
-MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv
-EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI
-BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko
-JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B
-AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg
-R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP
-HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0
-OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN
-D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN
-Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs
-KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H
-ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of
-Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR
-XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv
-t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx
-FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5
-MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV
-BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw
-yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js
-Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU
-Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY
-qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q
-Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG
-UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78
-qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG
-2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1
-IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5
-7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5
-EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw
-HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p
-8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz
-eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g
-x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn
-LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS
-o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU
-HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g
-IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k
-Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc
-Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc
-Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ
-HInwg85pGm+sEkYbYFRBD0woPBsL3g==
------END CERTIFICATE-----

location/caiman/user/gps.cfg

@@ -7,9 +7,10 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
 chpp_betp_client=1
@@ -52,7 +53,7 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x5
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -70,6 +71,7 @@ isForceHighAccuracyMode=1
 cp_partial_reset_disable=1
 isUseUncalAccel=1
 isUseUncalMagn=0
+NavOptions=0x2443
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0

location/caiman/user/gps.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="false"
-       Log="JAVA"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="false"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="false"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-       MaxThreadNum="13"
-       SensorsMask="0x244"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="0"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/caiman/user/lhd.conf

@@ -1,31 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-# LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/caiman/user/scd.conf

@@ -1,5 +0,0 @@
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20

location/caiman/userdebug/gps.cfg

@@ -20,12 +20,14 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 # Enable/Disable 1PPS Time Sync policy
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 
 MaxNtnRefLocAgeSecs=600
 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK
@@ -180,7 +182,13 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x5
+
+# 0x0001: CHIP_CONFIG_MEMS_ACCEL_AVAILABLE
+# 0x0002: CHIP_CONFIG_MEMS_MAGN_AVAILABLE
+# 0x0004: CHIP_CONFIG_MEMS_GYRO_AVAILABLE
+# 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE
+# 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -211,6 +219,13 @@ cp_partial_reset_disable=1
 isUseUncalAccel=1
 isUseUncalMagn=0
 
+# 0x0001: Enable StaticNavMode
+# 0x0002: Enable TunnelDetection
+# 0x0040: Self-detection Algorithm works
+# 0x0400: Enable MEMS S5
+# 0x2000: Enable MEMS PGMF (Pedestrian GNSS + MEMS Fusion)
+NavOptions=0x2443
+
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0

location/caiman/userdebug/gps.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="true"
-       Log="JAVA"
-       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="true"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="true"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-       MaxThreadNum="13"
-       SensorsMask="0x244"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="2"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/caiman/userdebug/lhd.conf

@@ -1,33 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/caiman/userdebug/scd.conf

@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

location/komodo/Android.bp

@@ -5,7 +5,7 @@ package {
 }
 
 soong_config_module_type {
-    name: "ignss_prebuilt_etc",
+    name: "gnss_prebuilt_etc",
     module_type: "prebuilt_etc",
     config_namespace: "gpssdk",
     variables: [
@@ -25,7 +25,7 @@ soong_config_string_variable {
     ],
 }
 
-ignss_prebuilt_etc {
+gnss_prebuilt_etc {
     name: "gps.cfg",
     soong_config_variables: {
         buildtype: {
@@ -46,107 +46,3 @@ ignss_prebuilt_etc {
     relative_install_path: "gnss",
     vendor: true,
 }
-
-soong_config_module_type {
-    name: "egnss_prebuilt_etc",
-    module_type: "prebuilt_etc",
-    config_namespace: "gpssdk",
-    variables: [
-        "gpsconf",
-    ],
-    properties: [
-        "src",
-    ],
-}
-
-soong_config_string_variable {
-    name: "gpsconf",
-    values: [
-        "factory",
-        "user",
-        "userdebug",
-        "eng",
-    ],
-}
-
-prebuilt_etc {
-    name: "gps.cer",
-    src: "gps.cer",
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "gps.xml",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/gps.xml",
-            },
-            userdebug: {
-                src: "userdebug/gps.xml",
-            },
-            eng: {
-                src: "userdebug/gps.xml",
-            },
-            factory: {
-                src: "factory/gps.xml",
-            },
-            conditions_default: {
-                src: "user/gps.xml",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "lhd.conf",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/lhd.conf",
-            },
-            userdebug: {
-                src: "userdebug/lhd.conf",
-            },
-            eng: {
-                src: "userdebug/lhd.conf",
-            },
-            factory: {
-                src: "factory/lhd.conf",
-            },
-            conditions_default: {
-                src: "user/lhd.conf",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "scd.conf",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/scd.conf",
-            },
-            userdebug: {
-                src: "userdebug/scd.conf",
-            },
-            eng: {
-                src: "userdebug/scd.conf",
-            },
-            factory: {
-                src: "factory/scd.conf",
-            },
-            conditions_default: {
-                src: "user/scd.conf",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}

location/komodo/factory/gps.xml

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="true"
-       Log="JAVA"
-       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="true"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="true"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="2"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/komodo/factory/lhd.conf

@@ -1,33 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/komodo/factory/scd.conf

@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

location/komodo/gps.cer

@@ -1,161 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
-MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
-2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
-1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
-q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
-tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
-vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
-5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
-1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
-NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
-Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
-8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
-pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx
-CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH
-Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV
-BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz
-dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF
-A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR
-44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk
-yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL
-66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6
-rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ
-oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp
-C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7
-tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/
-yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/
-MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv
-EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI
-BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko
-JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B
-AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg
-R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP
-HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0
-OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN
-D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN
-Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs
-KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H
-ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of
-Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR
-XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv
-t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx
-FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5
-MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV
-BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw
-yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js
-Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU
-Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY
-qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q
-Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG
-UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78
-qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG
-2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1
-IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5
-7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5
-EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw
-HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p
-8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz
-eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g
-x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn
-LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS
-o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU
-HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g
-IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k
-Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc
-Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc
-Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ
-HInwg85pGm+sEkYbYFRBD0woPBsL3g==
------END CERTIFICATE-----

location/komodo/user/gps.cfg

@@ -7,9 +7,10 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
 chpp_betp_client=1
@@ -52,7 +53,7 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x5
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -70,6 +71,7 @@ isForceHighAccuracyMode=1
 cp_partial_reset_disable=1
 isUseUncalAccel=1
 isUseUncalMagn=0
+NavOptions=0x2443
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0

location/komodo/user/gps.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="false"
-       Log="JAVA"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="false"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="false"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-       MaxThreadNum="13"
-       SensorsMask="0x244"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="0"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/komodo/user/lhd.conf

@@ -1,31 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-# LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/komodo/user/scd.conf

@@ -1,5 +0,0 @@
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20

location/komodo/userdebug/gps.cfg

@@ -20,12 +20,14 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 # Enable/Disable 1PPS Time Sync policy
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 
 MaxNtnRefLocAgeSecs=600
 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK
@@ -180,7 +182,13 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x5
+
+# 0x0001: CHIP_CONFIG_MEMS_ACCEL_AVAILABLE
+# 0x0002: CHIP_CONFIG_MEMS_MAGN_AVAILABLE
+# 0x0004: CHIP_CONFIG_MEMS_GYRO_AVAILABLE
+# 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE
+# 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -211,6 +219,13 @@ cp_partial_reset_disable=1
 isUseUncalAccel=1
 isUseUncalMagn=0
 
+# 0x0001: Enable StaticNavMode
+# 0x0002: Enable TunnelDetection
+# 0x0040: Self-detection Algorithm works
+# 0x0400: Enable MEMS S5
+# 0x2000: Enable MEMS PGMF (Pedestrian GNSS + MEMS Fusion)
+NavOptions=0x2443
+
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0
@@ -286,4 +301,3 @@ GNSS_CARRIER_ID=9
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 GNSS_CARRIER_CONFIG_END
-

location/komodo/userdebug/gps.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="true"
-       Log="JAVA"
-       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="true"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="true"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-       MaxThreadNum="13"
-       SensorsMask="0x244"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="2"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/komodo/userdebug/lhd.conf

@@ -1,33 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/komodo/userdebug/scd.conf

@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

location/ripcurrent24/Android.bp

@@ -5,7 +5,7 @@ package {
 }
 
 soong_config_module_type {
-    name: "ignss_prebuilt_etc",
+    name: "gnss_prebuilt_etc",
     module_type: "prebuilt_etc",
     config_namespace: "gpssdk",
     variables: [
@@ -25,7 +25,7 @@ soong_config_string_variable {
     ],
 }
 
-ignss_prebuilt_etc {
+gnss_prebuilt_etc {
     name: "gps.cfg",
     soong_config_variables: {
         buildtype: {
@@ -46,107 +46,3 @@ ignss_prebuilt_etc {
     relative_install_path: "gnss",
     vendor: true,
 }
-
-soong_config_module_type {
-    name: "egnss_prebuilt_etc",
-    module_type: "prebuilt_etc",
-    config_namespace: "gpssdk",
-    variables: [
-        "gpsconf",
-    ],
-    properties: [
-        "src",
-    ],
-}
-
-soong_config_string_variable {
-    name: "gpsconf",
-    values: [
-        "factory",
-        "user",
-        "userdebug",
-        "eng",
-    ],
-}
-
-prebuilt_etc {
-    name: "gps.cer",
-    src: "gps.cer",
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "gps.xml",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/gps.xml",
-            },
-            userdebug: {
-                src: "userdebug/gps.xml",
-            },
-            eng: {
-                src: "userdebug/gps.xml",
-            },
-            factory: {
-                src: "factory/gps.xml",
-            },
-            conditions_default: {
-                src: "user/gps.xml",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "lhd.conf",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/lhd.conf",
-            },
-            userdebug: {
-                src: "userdebug/lhd.conf",
-            },
-            eng: {
-                src: "userdebug/lhd.conf",
-            },
-            factory: {
-                src: "factory/lhd.conf",
-            },
-            conditions_default: {
-                src: "user/lhd.conf",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "scd.conf",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/scd.conf",
-            },
-            userdebug: {
-                src: "userdebug/scd.conf",
-            },
-            eng: {
-                src: "userdebug/scd.conf",
-            },
-            factory: {
-                src: "factory/scd.conf",
-            },
-            conditions_default: {
-                src: "user/scd.conf",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}

location/ripcurrent24/factory/gps.xml

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="true"
-       Log="JAVA"
-       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="true"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="true"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="2"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/ripcurrent24/factory/lhd.conf

@@ -1,33 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/ripcurrent24/factory/scd.conf

@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

location/ripcurrent24/gps.cer

@@ -1,161 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
-MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
-2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
-1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
-q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
-tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
-vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
-5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
-1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
-NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
-Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
-8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
-pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx
-CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH
-Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV
-BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz
-dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF
-A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR
-44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk
-yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL
-66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6
-rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ
-oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp
-C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7
-tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/
-yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/
-MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv
-EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI
-BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko
-JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B
-AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg
-R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP
-HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0
-OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN
-D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN
-Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs
-KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H
-ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of
-Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR
-XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv
-t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx
-FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5
-MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV
-BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw
-yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js
-Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU
-Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY
-qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q
-Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG
-UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78
-qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG
-2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1
-IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5
-7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5
-EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw
-HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p
-8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz
-eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g
-x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn
-LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS
-o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU
-HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g
-IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k
-Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc
-Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc
-Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ
-HInwg85pGm+sEkYbYFRBD0woPBsL3g==
------END CERTIFICATE-----

location/ripcurrent24/user/gps.cfg

@@ -7,9 +7,10 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
 chpp_betp_client=1
@@ -52,7 +53,7 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x5
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -65,6 +66,8 @@ IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 cp_partial_reset_disable=1
 isUseUncalAccel=1
+isUseUncalMagn=0
+NavOptions=0x2443
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0

location/ripcurrent24/user/gps.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="false"
-       Log="JAVA"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="false"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="false"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-       MaxThreadNum="13"
-       SensorsMask="0x244"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="0"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/ripcurrent24/user/lhd.conf

@@ -1,31 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-# LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/ripcurrent24/user/scd.conf

@@ -1,5 +0,0 @@
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20

location/ripcurrent24/userdebug/gps.cfg

@@ -20,12 +20,14 @@ gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
 
+allow_logging_if_disconnected=0
+
 # enable ism stream for GAAM
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
 
 # Enable/Disable 1PPS Time Sync policy
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 
 MaxNtnRefLocAgeSecs=600
 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK
@@ -180,7 +182,13 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x5
+
+# 0x0001: CHIP_CONFIG_MEMS_ACCEL_AVAILABLE
+# 0x0002: CHIP_CONFIG_MEMS_MAGN_AVAILABLE
+# 0x0004: CHIP_CONFIG_MEMS_GYRO_AVAILABLE
+# 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE
+# 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -203,8 +211,16 @@ isForceHighAccuracyMode=1
 # 1       = CP partial reset feature disabled
 cp_partial_reset_disable=1
 
-# 0: Use calibrated Accel data 1: Use uncalibrated Accel data
+# 0: Use calibrated data 1: Use uncalibrated data
 isUseUncalAccel=1
+isUseUncalMagn=0
+
+# 0x0001: Enable StaticNavMode
+# 0x0002: Enable TunnelDetection
+# 0x0040: Self-detection Algorithm works
+# 0x0400: Enable MEMS S5
+# 0x2000: Enable MEMS PGMF (Pedestrian GNSS + MEMS Fusion)
+NavOptions=0x2443
 
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT

location/ripcurrent24/userdebug/gps.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="true"
-       Log="JAVA"
-       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="true"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="true"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-       MaxThreadNum="13"
-       SensorsMask="0x244"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="2"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/ripcurrent24/userdebug/lhd.conf

@@ -1,33 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/ripcurrent24/userdebug/scd.conf

@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

location/ripcurrentpro/Android.bp

@@ -5,7 +5,7 @@ package {
 }
 
 soong_config_module_type {
-    name: "ignss_prebuilt_etc",
+    name: "gnss_prebuilt_etc",
     module_type: "prebuilt_etc",
     config_namespace: "gpssdk",
     variables: [
@@ -25,7 +25,7 @@ soong_config_string_variable {
     ],
 }
 
-ignss_prebuilt_etc {
+gnss_prebuilt_etc {
     name: "gps.cfg",
     soong_config_variables: {
         buildtype: {
@@ -46,107 +46,3 @@ ignss_prebuilt_etc {
     relative_install_path: "gnss",
     vendor: true,
 }
-
-soong_config_module_type {
-    name: "egnss_prebuilt_etc",
-    module_type: "prebuilt_etc",
-    config_namespace: "gpssdk",
-    variables: [
-        "gpsconf",
-    ],
-    properties: [
-        "src",
-    ],
-}
-
-soong_config_string_variable {
-    name: "gpsconf",
-    values: [
-        "factory",
-        "user",
-        "userdebug",
-        "eng",
-    ],
-}
-
-prebuilt_etc {
-    name: "gps.cer",
-    src: "gps.cer",
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "gps.xml",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/gps.xml",
-            },
-            userdebug: {
-                src: "userdebug/gps.xml",
-            },
-            eng: {
-                src: "userdebug/gps.xml",
-            },
-            factory: {
-                src: "factory/gps.xml",
-            },
-            conditions_default: {
-                src: "user/gps.xml",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "lhd.conf",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/lhd.conf",
-            },
-            userdebug: {
-                src: "userdebug/lhd.conf",
-            },
-            eng: {
-                src: "userdebug/lhd.conf",
-            },
-            factory: {
-                src: "factory/lhd.conf",
-            },
-            conditions_default: {
-                src: "user/lhd.conf",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}
-
-egnss_prebuilt_etc {
-    name: "scd.conf",
-    soong_config_variables: {
-        gpsconf: {
-            user: {
-                src: "user/scd.conf",
-            },
-            userdebug: {
-                src: "userdebug/scd.conf",
-            },
-            eng: {
-                src: "userdebug/scd.conf",
-            },
-            factory: {
-                src: "factory/scd.conf",
-            },
-            conditions_default: {
-                src: "user/scd.conf",
-            },
-        },
-    },
-    relative_install_path: "gnss",
-    vendor: true,
-}

location/ripcurrentpro/factory/gps.xml

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="true"
-       Log="JAVA"
-       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="true"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="true"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="2"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/ripcurrentpro/factory/lhd.conf

@@ -1,33 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false

location/ripcurrentpro/factory/scd.conf

@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf

location/ripcurrentpro/gps.cer

@@ -1,161 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
-MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
-2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
-1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
-q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
-tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
-vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
-5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
-1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
-NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
-Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
-8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
-pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFZTCCA02gAwIBAgIPAWv6o5fPZQ5hxva1vuNrMA0GCSqGSIb3DQEBCwUAMDgx
-CzAJBgNVBAYTAkpQMRcwFQYDVQQKDA5SYWt1dGVuIE1vYmlsZTEQMA4GA1UEAwwH
-Um9vdCBDQTAeFw0xOTA3MTYxMTU1NDJaFw0yOTA3MTMxMTU1NDJaMD4xCzAJBgNV
-BAYTAkpQMRcwFQYDVQQKEw5SYWt1dGVuIE1vYmlsZTEWMBQGA1UEAxMNREMgSXNz
-dWluZyBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAObjAbQ8TkzF
-A+/WvSE6fzDf+rlvBKY1dJJbiJ2/j0lc+tj56dE7+BhZ2JVmAYIYfEoUw69dwxTR
-44EdZln3ZVFmMuOdfxvF9A46pMKzH1skr8ErDgjNyJ9f/JOuQ29p/7BvLC55aRzk
-yj99BYdzJWKs+5W7jQlv7/HyJ/PQ+rUEBOx4o/YiTucDFduWdV6/x5mcEbKD3ufL
-66vUEf3MHGegDkOWAMTchl1RmaYDlf3IMsXC7M2bFPFa/9y/vzaaY6EhnJ861co6
-rkOhTZe/kJZwqQYFmWczBPZK/9zRy3C1zA09tCBk+CDNBrNXe+3dMLFmnW4npxUQ
-oceTPhaaDo5lA6HkkARwVWLrporFZ2B/th2Bqtu6uObLSB6JMA2jxmKwKukM8/jp
-C9tKV9X03rHQIQultc63rivPdgQvqYgW1PVdzV1a3pZEMk5zv257+fxgfUGzfUh7
-tx0OY+BkykSP6ZK/BsbI/BY+rsS0L/0lmC22NU1p+qVeN3ZRHoqntB+FymaBfQ3/
-yfKkDNfnMua5GzLyyYGYUDDx71rtfrs3hGDiwjvE4B0IvsU0E7Oerk5gLqx8t0q/
-MmhI+CJJS1bH2sRBMcqfRAv+eyByFsvLY7Er/ztveaabX9xEwyPNFOcU+SZMhipv
-EUKmUcOAHxzx4HbYEFyM0Z7WgUdlTd1xAgMBAAGjZjBkMB8GA1UdIwQYMBaAFPUI
-BlLFno+y5xdHlCX349iVyS75MB0GA1UdDgQWBBQzVhTSCf8F31Zf0Bu661qymMko
-JzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADANBgkqhkiG9w0B
-AQsFAAOCAgEADQEufjma/6fT/Do4Fh13lZhsowHSsGv5sFYly6224GsciE80ZwYg
-R4EK/TAR0jorBXsu6sQc51pZ5SSHhIxfo2frfprTPaaWN6cZwfrb6UcnD/FaZ1jP
-HzWrI3kRxG9JCDffzE8uMf8Rnc69n1j+TBerk4Ix3Zui2TaaF6LVceJ4RgeNkZl0
-OFkGGFruHz/d83q7A6YjgN0iwMEabdtKH7Sq27LqGPeCS8NuGlrziNAxktdwaYlN
-D5t6ntM/1nHYPmVqdioEU9vAnyB3BiXOlITPHEEMOSlItcUsJ6rN5DZJaJgkBxvN
-Qdi6wmaDlxy8XFyy4KGFKWAl17FlfpqW5VtYQJ4aDpibGlGqamg0vm+IJDIGPlOs
-KQcxG17cOw4MCflAtnzHKHBn52DegQKwxev2ZpqdwVw/NqPq0yTNEbCRqEyiq7+H
-ljKEFiEjEjeXTcqR4DoCseA5UgcriuriV0OCvr8KTlviV4FEUu+IA9ut8YIvf2of
-Zz0z8rO4H+Rb4tMi/yBRM09x3rEW4hXwO0qpCBNBa0wEJBxufF3f6l9efEle+YTR
-XS92gutaoVluqMfRSJckjwWokToi32/FvF79guZymD0qHkOSi5dewsIW7zsdobvv
-t2CWLfTAb9cx222ELBpVPkfcgUKfF4RCGWPzuAlK6OueuDrInOiz8ag=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFUjCCAzqgAwIBAgICBpAwDQYJKoZIhvcNAQELBQAwODELMAkGA1UEBhMCSlAx
-FzAVBgNVBAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMB4XDTE5
-MDcxNjEwNTkwMVoXDTM5MDcxNTEwNTkwMVowODELMAkGA1UEBhMCSlAxFzAVBgNV
-BAoMDlJha3V0ZW4gTW9iaWxlMRAwDgYDVQQDDAdSb290IENBMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAqiPMbNudotG8afkk5Fwo2QdDcFFmC+qGpGjw
-yQs57QtGPRk1HsIhZFfr6zn8t1tZw6Zo+A0biFA7d2N93nYsseHBy/bZlhhOL+Js
-Jb907UM09L5xaJIgnbFYVT1QjtB7ksLAy3rHpdSKiggfT1ynwM/u6wIdWRSx24QU
-Vxpq5iFpVj041+/RnpCPASL5pSnbYZKQyOb/XsOaR+hz7aSjwiUzk2cRjAmRqYxY
-qYVe135IAy377inJRtUPvi3IhtmUHJToiMLBH5tChkjkIpdRG1lVIj4vGdzrIb+Q
-Kvg/k7BDVZ3sstsLvJ8evNonBzrqcr80ek/X+HFrgY/3M1VEru4ohLAiA877CuuG
-UAfrxFh9qjP1yue+dlrQWk+WHMbGMzKI1zCKEMphJatyNHfpRtD8LUWtLV96DD78
-qLwQwrSYrEMd2u/akeBFKINYWqpqkVBhSsV3eukXVIdSbtSAxZNv+4m6QddEcUvG
-2ZLf+yCf2tl+LPGXNL08vwMVbQqcDw8m+nDP4vu0VUixddyoqnnDlWOoQESuQFQ1
-IqYFQhRPs2dFRf5TJzkmbqRUXbaPxsrKGjTtVpPgENbv40nyRGyBbl1CzqpBFEp5
-7w4MPYDIzWKYbRyCnUE5WScRBFmym7242KA3SOfkylzGMb8KGJxohVME+7oMbNf5
-EjLWVgECAwEAAaNmMGQwHwYDVR0jBBgwFoAU9QgGUsWej7LnF0eUJffj2JXJLvkw
-HQYDVR0OBBYEFPUIBlLFno+y5xdHlCX349iVyS75MA4GA1UdDwEB/wQEAwIBBjAS
-BgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCDGIeYrtivFt3p
-8k5vXKFUT072C7wMvfrAGYCYgIdUthWCqJoMwnG3Fsg7Ngu70La7ESBzEKpnpPWz
-eIdnREJkNP9iqiKHXnaUV2P/21AS1q6enVKBFOl7dYiVjqOZ+vac3a1UjLWkvm0g
-x4sg/f3PpiEzZM7ecnQYk2wfMSq8Jw0w1Lf0SEeoYZTkf12cqSJVSa/G7gEdL/Cn
-LO3yyBq0KPNdd87eIfvCLJj55UJ5dCr0JXRTUteBvJwflbPXmOqfI8fA05fwlJZS
-o1SBpMI9cEBwaPXQM9CPNKaWLvyOR1KpviRzbCnaKf44Fs2OuZboo3avZrC9eUoU
-HU2HKXRj8UMRlFeCdNugbOdGyK+CpXwMHVtIrtpf0iOUqo0rOekgnUSNi9qyjD1g
-IV3Y/NLVl9fqe8q66IWUn8NYndxigMKWcMCBFUjfP0yMZeqSHFiIv7zk9PuV/62k
-Yele7cK9iHnEUwWBj6VCEs6pZBS1QSmhRw3GWlSDc/gHXd38PG20zH7xg4z2H9Rc
-Op9P1ZW2kjqv5D2+q/qtaePAyHn3B05UZrQYUmx7LaHNO7op6dZgCdoR0sVsR+Fc
-Zyr0AhgiuTWrjtUEOGx2qJVwAsHkpqtlN+DaGT08dT64LvIf0bfGvmtm++/WEDWJ
-HInwg85pGm+sEkYbYFRBD0woPBsL3g==
------END CERTIFICATE-----

location/ripcurrentpro/user/gps.cfg

@@ -7,9 +7,10 @@ GlueLayer_EnableGnssCfgInterface=1
 gnss_device_type=K042
 gnss_device_patch_address=0
 gnss_device_patch_file=/vendor/firmware/kepler.bin
+allow_logging_if_disconnected=0
 ism_stream_enable=1
 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
-Is1PPSTimeSyncEnable=0
+Is1PPSTimeSyncEnable=1
 MaxNtnRefLocAgeSecs=600
 GlueLayer_IsPlatformRefTimeEnable=1
 chpp_betp_client=1
@@ -52,7 +53,7 @@ GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsRilCIDReqEnable=0
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x5
+Chip_Configuration_mems_data_Configuration=0x25
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
@@ -65,6 +66,8 @@ IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 cp_partial_reset_disable=1
 isUseUncalAccel=1
+isUseUncalMagn=0
+NavOptions=0x2443
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0

location/ripcurrentpro/user/gps.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
-  <hal
-       PortName="/dev/ttyBCM"
-       BaudRate="921600"
-       GpioNStdbyPath="/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby"
-       CustGpioDelayMs="250"
-       LogEnabled="false"
-       Log="JAVA"
-       LogDirectory="/sdcard/gps/broadcom/storage/"
-       CtrlPipe="/data/vendor/gps/glgpsctrl"
-       NmeaOutName="/data/vendor/gps/nmea_out"
-
-       acSuplServer="supl.google.com"
-       SuplPort="7275"
-       SuplLogEnable="false"
-       SuplLogFullName="/data/vendor/gps/suplflow.txt"
-       tlsEnable="true"
-
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
-       SuplEnable="true"
-       SuplUseApn="false"
-       SuplUseApnNI="true"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       SuplTlsCertDirPath="/etc/security/cacerts"
-       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       TcpConnectionTimeout="20"
-       SuplLppCapable="true"
-       SuplEcidCapable="true"
-       SuplVersion="2"
-       SuplMinorVersion="0"
-       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
-       SuplGlonassCapable = "true"
-       SuplGalileoCapable = "true"
-       SuplBdsCapable = "true"
-       SuplMgpsCapable = "true"
-
-       RtoEnable="true"
-       RtiEnable="true"
-       HttpSyncLto="true"
-       LtoFileName="lto2.dat"
-       LtoDir="/data/vendor/gps/"
-       LtoSyncThresholdDays="1"
-
-       GnssYearOfHardware="2020"
-       CpGuardTimeSec="2"
-       CpLppGuardTimeSec="2"
-       IgnoreInjectedSystemTime="true"
-
-       AttributionAppPkgName="com.google.android.carrierlocation"
-
-       AssertEnabled="false"
-       CpLppeCancelDbhOnAgnssProvideLoc="true"
-       CpLppeUseAgnssLocForEmptyDbh="true"
-       CpLppHighAccuracyShapeMode="2"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="1200"
-       RuntimeSwLteFilterEnable="true"
-       MaxThreadNum="13"
-       SensorsMask="0x244"
-  />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
-       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
-       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-       ExtL5Bias="13.0"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="3.5"
-       RfPathLossDb_Cp="3.5"
-       RfPathLossDb_Ap_L5="3.5"
-       RfPathLossDb_Cp_L5="3.5"
-       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
-
-       EnableOnChipStopNotification="0"
-       PowerMode="3"
-       MinGpsWeekNumber="2216"
-       OnChipAccMask="50"
-
-       EnableB1C="false"
-       EnableCoex="true"
-  />
-
-  <gll_features
-       EnableNicAutoSwitch="true"
-       EnableNavic="true"
-  />
-
-</glgps>
-

location/ripcurrentpro/user/lhd.conf

@@ -1,31 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/111e0000.spi/spi_master/spi21/spi21.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-# LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=false
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false