diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index e077b7e..727c82e 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -964,6 +964,8 @@
+
+
diff --git a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so
index 6bb4b10..861ef15 100644
Binary files a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ
diff --git a/audio/comet/tuning/apmg3/downlink_handset_config.pb b/audio/comet/tuning/apmg3/downlink_handset_config.pb
index 0b622ac..18af1aa 100644
Binary files a/audio/comet/tuning/apmg3/downlink_handset_config.pb and b/audio/comet/tuning/apmg3/downlink_handset_config.pb differ
diff --git a/audio/comet/tuning/apmg3/downlink_handset_hac_config.pb b/audio/comet/tuning/apmg3/downlink_handset_hac_config.pb
new file mode 100644
index 0000000..327aeb5
Binary files /dev/null and b/audio/comet/tuning/apmg3/downlink_handset_hac_config.pb differ
diff --git a/audio/comet/tuning/apmg3/downlink_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_speaker_config.pb
index f8cee42..c67bc35 100644
Binary files a/audio/comet/tuning/apmg3/downlink_speaker_config.pb and b/audio/comet/tuning/apmg3/downlink_speaker_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb
index 9351945..31d6b8a 100644
Binary files a/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb and b/audio/comet/tuning/apmg3/uplink_handset_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb
index 58dc380..a154819 100644
Binary files a/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_handset_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_handset_hac_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_off_config.pb
new file mode 100644
index 0000000..2b4edbd
Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_off_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_handset_hac_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_on_config.pb
new file mode 100644
index 0000000..2fd9459
Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_on_config.pb differ
diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb
index d40e099..45932bb 100644
Binary files a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb differ
diff --git a/audio/comet/tuning/fortemedia/BLUETOOTH.dat b/audio/comet/tuning/fortemedia/BLUETOOTH.dat
index 5386f11..8b96f36 100644
Binary files a/audio/comet/tuning/fortemedia/BLUETOOTH.dat and b/audio/comet/tuning/fortemedia/BLUETOOTH.dat differ
diff --git a/audio/comet/tuning/fortemedia/BLUETOOTH.mods b/audio/comet/tuning/fortemedia/BLUETOOTH.mods
index db2e674..86d9f78 100644
--- a/audio/comet/tuning/fortemedia/BLUETOOTH.mods
+++ b/audio/comet/tuning/fortemedia/BLUETOOTH.mods
@@ -3,7 +3,7 @@
#EXPORT_FLAG BLUETOOTH
#PARAM_MODE FULL
#SAVE_MODE 3
-#SAVE_TIME 2024-05-13 19:13:48
+#SAVE_TIME 2024-12-05 17:12:00
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-WB
#PARAM_TYPE TX+2RX
@@ -832,12 +832,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -3527,12 +3527,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -6222,12 +6222,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
diff --git a/audio/comet/tuning/fortemedia/HANDSET.dat b/audio/comet/tuning/fortemedia/HANDSET.dat
index 38a5488..bbb3cb2 100644
Binary files a/audio/comet/tuning/fortemedia/HANDSET.dat and b/audio/comet/tuning/fortemedia/HANDSET.dat differ
diff --git a/audio/comet/tuning/fortemedia/HANDSET.mods b/audio/comet/tuning/fortemedia/HANDSET.mods
index 9c402e9..e4f3346 100644
--- a/audio/comet/tuning/fortemedia/HANDSET.mods
+++ b/audio/comet/tuning/fortemedia/HANDSET.mods
@@ -3,7 +3,7 @@
#EXPORT_FLAG HANDSET
#PARAM_MODE FULL
#SAVE_MODE 3
-#SAVE_TIME 2024-04-30 11:22:55
+#SAVE_TIME 2024-12-05 17:12:01
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-WB
#PARAM_TYPE TX+2RX
@@ -832,12 +832,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -3527,12 +3527,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -6222,12 +6222,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -8917,12 +8917,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -11612,12 +11612,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -13487,7 +13487,7 @@
0 0x4000 //TX_OPERATION_MODE_0
1 0x0000 //TX_OPERATION_MODE_1
2 0x0036 //TX_PATCH_REG
-3 0x6F5E //TX_SENDFUNC_MODE_0
+3 0x6F7E //TX_SENDFUNC_MODE_0
4 0x0004 //TX_SENDFUNC_MODE_1
5 0x0002 //TX_NUM_MIC
6 0x0003 //TX_SAMPLINGFREQ_SIG
@@ -14307,12 +14307,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -17002,12 +17002,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -19697,12 +19697,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -22392,12 +22392,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -25087,12 +25087,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -27782,12 +27782,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -30477,12 +30477,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -33172,12 +33172,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0ED8 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1450 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1838 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
diff --git a/audio/comet/tuning/fortemedia/HANDSFREE.dat b/audio/comet/tuning/fortemedia/HANDSFREE.dat
index 73fb287..9f8a526 100644
Binary files a/audio/comet/tuning/fortemedia/HANDSFREE.dat and b/audio/comet/tuning/fortemedia/HANDSFREE.dat differ
diff --git a/audio/comet/tuning/fortemedia/HANDSFREE.mods b/audio/comet/tuning/fortemedia/HANDSFREE.mods
index 14c5706..cbffdc7 100644
--- a/audio/comet/tuning/fortemedia/HANDSFREE.mods
+++ b/audio/comet/tuning/fortemedia/HANDSFREE.mods
@@ -3,7 +3,7 @@
#EXPORT_FLAG HANDSFREE
#PARAM_MODE FULL
#SAVE_MODE 3
-#SAVE_TIME 2024-05-13 19:14:38
+#SAVE_TIME 2024-12-05 17:27:03
#CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-WB
#PARAM_TYPE TX+2RX
@@ -832,12 +832,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -3527,12 +3527,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -6222,12 +6222,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -8097,7 +8097,7 @@
0 0x4001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
2 0x00BB //TX_PATCH_REG
-3 0x6F5C //TX_SENDFUNC_MODE_0
+3 0x6F7C //TX_SENDFUNC_MODE_0
4 0x0004 //TX_SENDFUNC_MODE_1
5 0x0003 //TX_NUM_MIC
6 0x0003 //TX_SAMPLINGFREQ_SIG
@@ -8917,12 +8917,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -11612,12 +11612,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -14307,12 +14307,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
diff --git a/audio/comet/tuning/fortemedia/HEADSET.dat b/audio/comet/tuning/fortemedia/HEADSET.dat
index b530baf..f0a62fc 100644
Binary files a/audio/comet/tuning/fortemedia/HEADSET.dat and b/audio/comet/tuning/fortemedia/HEADSET.dat differ
diff --git a/audio/comet/tuning/fortemedia/HEADSET.mods b/audio/comet/tuning/fortemedia/HEADSET.mods
index 487016b..805e4eb 100644
--- a/audio/comet/tuning/fortemedia/HEADSET.mods
+++ b/audio/comet/tuning/fortemedia/HEADSET.mods
@@ -3,7 +3,7 @@
#EXPORT_FLAG HEADSET
#PARAM_MODE FULL
#SAVE_MODE 3
-#SAVE_TIME 2024-05-13 19:13:34
+#SAVE_TIME 2024-12-05 17:11:59
#CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-WB
#PARAM_TYPE TX+2RX
@@ -17002,12 +17002,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -19697,12 +19697,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -22392,12 +22392,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -41257,12 +41257,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -43952,12 +43952,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
@@ -46647,12 +46647,12 @@
820 0x0000 //TX_FDDRC_RESRV_4
821 0x0000 //TX_FDDRC_RESRV_5
822 0x0000 //TX_FDDRC_RESRV_6
-823 0x7FFF //TX_NOISE_FLOOR_TH
-824 0x0001 //TX_NOISE_TH_BGN_LEVEL_1
-825 0x7FFF //TX_NOISE_TH_BGN_LEVEL_2
-826 0x0000 //TX_NOISE_TH_BGN_LEVEL_3
-827 0x0000 //TX_NOISE_IN_N
-828 0x0000 //TX_NOISE_OUT_N
+823 0x0001 //TX_NOISE_FLOOR_TH
+824 0x0B54 //TX_NOISE_TH_BGN_LEVEL_1
+825 0x1068 //TX_NOISE_TH_BGN_LEVEL_2
+826 0x1770 //TX_NOISE_TH_BGN_LEVEL_3
+827 0x01F4 //TX_NOISE_IN_N
+828 0x01F4 //TX_NOISE_OUT_N
829 0x7C00 //TX_LAMBDA_PKA_FP
830 0x2000 //TX_TPKA_FP
831 0x0080 //TX_MIN_G_FP
diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 6f823bc..4f85111 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -46,3 +46,6 @@ ThreadDispatcherEnabled = true
# A2DP_LDAC_QUALITY_LOW 2 // Equal to 330/303(kbps)
# A2DP_LDAC_QUALITY_ABR 3 // ABR mode, range: 990,660,492,396,330(kbps)
LdacDefaultQualityMode = 3
+
+# APM Uart skip suspend to aovid hold system too long when BT using AOC UART
+ApmUartSkipSuspend = true
diff --git a/comet/overlay/frameworks/base/core/res/res/values/config.xml b/comet/overlay/frameworks/base/core/res/res/values/config.xml
index a50bb31..41d2829 100644
--- a/comet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/comet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -179,9 +179,12 @@
auto-brightness adjustment setting. -->
105%
- 52dp
- 52dp
- 52dp
+
+ 66dp
+
+ 24dp
diff --git a/device-comet.mk b/device-comet.mk
index 1806ff1..0ebd00c 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -72,7 +72,7 @@ include device/google/comet/audio/comet/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/gti/predump_gti_dual.mk
-include device/google/gs-common/display/dump_second_display.mk
+include device/google/gs-common/display/dump_exynos_second_display.mk
include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk
# Increment the SVN for any official public releases
@@ -491,10 +491,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
# LE Audio Unicast Allowlist
PRODUCT_PRODUCT_PROPERTIES += \
- persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5
+ persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630
SUPPORT_VENDOR_SATELLITE_SERVICE := true
+# Support NTN(satellite) with dual SIM
+NTN_DUAL_SIM := true
+
# 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
@@ -543,3 +546,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/google/comet/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
+
+# Enable APF by default
+PRODUCT_VENDOR_PROPERTIES += \
+ vendor.powerhal.apf_disabled=false \
+ vendor.powerhal.apf_enabled=true
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 212c435..3a5e644 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,7 +1,7 @@
com.google.hardware.pixel.display
- 13
+ 13-14
IDisplay
secondary
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index d41a982..bbfe8e7 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -23,17 +23,17 @@ ChipCfg_VDR_high_end_Distance = 200
ChipCfg_VDR_low_end_Distance = 200
ChipCfg_VDR_high_end_Time = 20
ChipCfg_VDR_low_end_Time = 20
-Chip_Configuration_AidingConfiguration=0x00020046
+Chip_Configuration_AidingConfiguration=0x000200C6
Chip_Configuration_RefClkControl=0x24
Chip_Configuration_DCXO_CrystalType=0x11
Chip_Configuration_GNSSConstConstraintDef = 0x60FF
LocTech_Constraints = 0x60FF
Chip_Configuration_RfMiscCtrl = 0x80008001
Chip_Configuration_ntn_option=2
-bdsUsedInUSPolicy=2
-sbasUsedInUSPolicy=2
-qzssUsedInUSPolicy=2
-navicUsedInUSPolicy=2
+bdsUsedPolicy=2
+sbasUsedPolicy=2
+qzssUsedPolicy=2
+navicUsedPolicy=2
Chip_Configuration_FeatureCfg_DVS = 1
Chip_Configuration_FeatureCfg_DFS = 1
Chip_Configuration_FeatureCfg_MTPL = 1
@@ -43,7 +43,6 @@ gnss_rfic_chip_id=55400000
UseRtcForAiding=1
additional_rtc_uncertainty_ms=10
Sif_UseFwXtraInterface=1
-Agnss_IsGloAidingEnable=0
SETCaps_IsOtdoa=1
SETCaps_IsLpp=1
SETCaps_SuplUT1=20
@@ -70,16 +69,20 @@ UP_LocTech_PrimaryConst=0
UP_LocTech_Constraints=1
UP_LocTech_Requirements=0
SpotLogger_Allowed=0
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
+SingleBandAcq=474
+MultiBandAcq=586
+SingleBandFullTrkNm=432
+SingleBandFullTrkUd=390
+MultiBandFullTrkNm=572
+MultiBandFullTrkUd=509
+SingleBandDutyCycleTrkNm=390
+SingleBandDutyCycleTrkUd=355
+MultiBandDutyCycleTrkNm=509
+MultiBandDutyCycleTrkUd=453
+SingleBandVddGnssNmTrk=145
+MultiBandVddGnssNmTrk=187
+SingleBandVddGnssUdTrk=103
+MultiBandVddGnssUdTrk=131
path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
path_delay_gps_2fx_cm = 12342
path_delay_bds_4fx_cm = 123
@@ -88,6 +91,7 @@ RfPathLossDb_Ap=3600
RfPathLossDb_Cp=3600
RfPathLossDb_L5_Ap=4300
RfPathLossDb_L5_Cp=4300
+NmeaBitmask=0x010003fff
IsUseEntireRespTime911=1
isForceHighAccuracyMode=1
cp_partial_reset_disable=1
@@ -139,6 +143,7 @@ ENABLE_4G_CP_CAPS_MSA=0
ENABLE_NLP_IN_LPPE=0
ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1
+CP_LOCTECH_CONSTRAINTS=5
GNSS_CARRIER_ID=3
ENABLE_LPP_UP=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 0641d1f..15244c1 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -62,8 +62,17 @@ ChipCfg_VDR_low_end_Distance = 200
ChipCfg_VDR_high_end_Time = 20
ChipCfg_VDR_low_end_Time = 20
+# 0x01 = Precise time aiding
+# 0x02 = Coarse time aiding *
+# 0x04 = Local time aiding *
+# 0x08 = CP time aiding
+# 0x10 = Frequency counter aiding
+# 0x20 = Frequency non-counter aiding
+# 0x40 = CP Frequency aiding *
+# 0x80 = Extend BE collection *
+# 0xFFFF0000 Frequency aiding PPM mask (example - 0x00020000 is .2PPM)
### temporarily disable precise time aiding ###
-Chip_Configuration_AidingConfiguration=0x00020046
+Chip_Configuration_AidingConfiguration=0x000200C6
# set shared reference clock for freq aiding (0x20)
# enable dcxo (0x04)
@@ -120,13 +129,15 @@ Chip_Configuration_RfMiscCtrl = 0x80008001
#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period.
Chip_Configuration_ntn_option=2
-# Disable BDS in the U.S.
-# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
-#gloUsedInUSPolicy=2
-bdsUsedInUSPolicy=2
-sbasUsedInUSPolicy=2
-qzssUsedInUSPolicy=2
-navicUsedInUSPolicy=2
+# Certain constellation permission overriding LocTech config setting: only to possibly
+# disallow constellations allowed in LocTech, not vice versa. Note: GPS and GAL are
+# allowed in all markets so no such overriding.
+# 0: not to override (default), 1-disabled, 2- disabled if in US
+#gloUsedPolicy=2
+bdsUsedPolicy=2
+sbasUsedPolicy=2
+qzssUsedPolicy=2
+navicUsedPolicy=2
# DVS: 0 = Disabled, 1 = Enabled (default)
# DFS: 0 = Disabled, 1 = Enabled (default)
@@ -178,7 +189,6 @@ Sif_UseFwXtraInterface=1
# The above sets the correct operation when the true week is between 1024 and 2048
# ChipCfg_GetGpsWeekFloor=0
-Agnss_IsGloAidingEnable=0
SETCaps_IsOtdoa=1
SETCaps_IsLpp=1
SETCaps_SuplUT1=20
@@ -213,16 +223,20 @@ UP_LocTech_Requirements=0
SpotLogger_Allowed=0
# GNSS power values in "mW"
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
+SingleBandAcq=474
+MultiBandAcq=586
+SingleBandFullTrkNm=432
+SingleBandFullTrkUd=390
+MultiBandFullTrkNm=572
+MultiBandFullTrkUd=509
+SingleBandDutyCycleTrkNm=390
+SingleBandDutyCycleTrkUd=355
+MultiBandDutyCycleTrkNm=509
+MultiBandDutyCycleTrkUd=453
+SingleBandVddGnssNmTrk=145
+MultiBandVddGnssNmTrk=187
+SingleBandVddGnssUdTrk=103
+MultiBandVddGnssUdTrk=131
path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
path_delay_gps_2fx_cm = 12342
@@ -302,6 +316,7 @@ ENABLE_4G_CP_CAPS_MSA=0
ENABLE_NLP_IN_LPPE=0
ENABLE_NLP_IN_AGNSS=1
ENABLE_LPP_HA_GAD_SHAPE=1
+CP_LOCTECH_CONSTRAINTS=5
# VZW
GNSS_CARRIER_ID=3
ENABLE_LPP_UP=1
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index c89f0b7..ff7c7d8 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -150,7 +150,7 @@ STNFC_CONTROL_CLK=0x00
###############################################################################
# Configure the ACTIVE_RW timer
# Default 0x00, set 0x01 to enable it
-# STNFC_ACTIVERW_TIMER=0x01
+STNFC_ACTIVERW_TIMER=0x01
###############################################################################
# Core configuration settings
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 6877507..df04723 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -59,7 +59,17 @@
"1000",
"500"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 3,
+ "ResetOnInit": true
+ },
+ {
+ "Name": "CPULittleClusterResponseTimeMs",
+ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/response_time_ms",
+ "Values": [
+ "9",
+ "13"
+ ],
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -100,7 +110,17 @@
"2000",
"500"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 4,
+ "ResetOnInit": true
+ },
+ {
+ "Name": "CPUMidClusterResponseTimeMs",
+ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/response_time_ms",
+ "Values": [
+ "52",
+ "56"
+ ],
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -142,7 +162,17 @@
"2000",
"500"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 3,
+ "ResetOnInit": true
+ },
+ {
+ "Name": "CPUBigClusterResponseTimeMs",
+ "Path": "/sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/response_time_ms",
+ "Values": [
+ "165",
+ "170"
+ ],
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -213,7 +243,7 @@
"0",
"1"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -223,7 +253,7 @@
"0",
"1"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -257,7 +287,7 @@
"7",
"8"
],
- "DefaultIndex": 2,
+ "DefaultIndex": 4,
"ResetOnInit": true
},
{
@@ -267,7 +297,7 @@
"0",
"512"
],
- "DefaultIndex": 0,
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -955,6 +985,8 @@
"Name": "PA_KILL",
"Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb",
"Values": [
+ "512000",
+ "307200",
"102400",
"0"
],
@@ -1065,6 +1097,13 @@
"Duration": 5000,
"Value": "512"
},
+ {
+ "PowerHint": "LAUNCH",
+ "Node": "TAUClampBoost",
+ "Duration": 5000,
+ "Value": "765",
+ "EnableProperty": "vendor.powerhal.apf_disabled"
+ },
{
"PowerHint": "LAUNCH",
"Node": "FGUClampBoost",
@@ -1252,7 +1291,8 @@
"PowerHint": "LAUNCH",
"Node": "TAAutoPreferFit",
"Duration": 5000,
- "Value": "1"
+ "Value": "1",
+ "EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
@@ -1260,35 +1300,47 @@
"Duration": 5000,
"Value": "0xff"
},
+ {
+ "PowerHint": "LAUNCH",
+ "Node": "TAPreferredIdleMaskMid",
+ "Duration": 5000,
+ "Value": "0xff",
+ "EnableProperty": "vendor.powerhal.apf_disabled"
+ },
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceEnable",
"Duration": 5000,
- "Value": "1"
+ "Value": "1",
+ "EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceHighValue",
- "Duration": 5000,
- "Value": "765"
+ "Duration": 5000,
+ "Value": "765",
+ "EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceHighPrio",
"Duration": 5000,
- "Value": "110"
+ "Value": "110",
+ "EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceMidValue",
- "Duration": 5000,
- "Value": "590"
+ "Duration": 5000,
+ "Value": "590",
+ "EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
"Node": "TAUclampMinOnNiceMidPrio",
"Duration": 5000,
- "Value": "139"
+ "Value": "139",
+ "EnableProperty": "vendor.powerhal.apf_enabled"
},
{
"PowerHint": "LAUNCH",
@@ -1296,6 +1348,12 @@
"Duration": 5000,
"Value": "1"
},
+ {
+ "PowerHint": "LAUNCH",
+ "Node": "TARampupMultiplier",
+ "Duration": 5000,
+ "Value": "4"
+ },
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUSkipMask",
@@ -1386,6 +1444,12 @@
"Duration": 2000,
"Value": "0"
},
+ {
+ "PowerHint": "LAUNCH_EXTEND",
+ "Node": "TARampupMultiplier",
+ "Duration": 2000,
+ "Value": "4"
+ },
{
"PowerHint": "LAUNCH_PMU",
"Node": "PMU_POLL",
@@ -1422,6 +1486,12 @@
"Duration": 33,
"Value": "820000"
},
+ {
+ "PowerHint": "CPU_LOAD_RESET",
+ "Node": "TAPreferHighCap",
+ "Duration": 33,
+ "Value": "1"
+ },
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "CPULittleClusterDownRateLimitUs",
@@ -1476,11 +1546,23 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_PA_KILL_BOOST",
+ "PowerHint": "CAMERA_PA_KILL_BOOST_LEVEL_1",
"Node": "PA_KILL",
"Duration": 0,
"Value": "102400"
},
+ {
+ "PowerHint": "CAMERA_PA_KILL_BOOST_LEVEL_2",
+ "Node": "PA_KILL",
+ "Duration": 0,
+ "Value": "307200"
+ },
+ {
+ "PowerHint": "CAMERA_PA_KILL_BOOST_LEVEL_3",
+ "Node": "PA_KILL",
+ "Duration": 0,
+ "Value": "512000"
+ },
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "CPUSkipMask",
@@ -3121,24 +3203,6 @@
"Duration": 0,
"Value": "1"
},
- {
- "PowerHint": "REFRESH_120FPS",
- "Node": "TAUClampBoost",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "REFRESH_60FPS",
- "Node": "TAUClampBoost",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "ADPF_DISABLE_TA_BOOST",
- "Node": "TAUClampBoost",
- "Duration": 0,
- "Value": "1"
- },
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
@@ -3154,13 +3218,31 @@
"PowerHint": "DISPLAY_IDLE",
"Node": "TARampupMultiplier",
"Duration": 0,
- "Value": "0"
+ "Value": "1"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "AdpfRampupMultiplier",
"Duration": 0,
- "Value": "0"
+ "Value": "1"
+ },
+ {
+ "PowerHint": "DISPLAY_IDLE",
+ "Node": "CPULittleClusterResponseTimeMs",
+ "Duration": 0,
+ "Value": "13"
+ },
+ {
+ "PowerHint": "DISPLAY_IDLE",
+ "Node": "CPUMidClusterResponseTimeMs",
+ "Duration": 0,
+ "Value": "56"
+ },
+ {
+ "PowerHint": "DISPLAY_IDLE",
+ "Node": "CPUBigClusterResponseTimeMs",
+ "Duration": 0,
+ "Value": "170"
},
{
"PowerHint": "DISPLAY_UPDATE_IMMINENT",
@@ -3382,13 +3464,15 @@
"PowerHint": "GAME",
"Node": "AutoMigrationMarginsEnable",
"Duration": 0,
- "Value": "1"
+ "Value": "1",
+ "EnableProperty": "vendor.powerhal.amm_enabled"
},
{
"PowerHint": "GAME",
"Node": "AutoDvfsHeadroomEnable",
"Duration": 0,
- "Value": "1"
+ "Value": "1",
+ "EnableProperty": "vendor.powerhal.amm_enabled"
},
{
"PowerHint": "GAME",
@@ -3402,6 +3486,24 @@
"Duration": 0,
"Value": "2"
},
+ {
+ "PowerHint": "GAME",
+ "Node": "CPULittleClusterResponseTimeMs",
+ "Duration": 0,
+ "Value": "9"
+ },
+ {
+ "PowerHint": "GAME",
+ "Node": "CPUMidClusterResponseTimeMs",
+ "Duration": 0,
+ "Value": "52"
+ },
+ {
+ "PowerHint": "GAME",
+ "Node": "CPUBigClusterResponseTimeMs",
+ "Duration": 0,
+ "Value": "165"
+ },
{
"PowerHint": "GAME",
"Node": "PerTaskMaxIowaitBoost",
@@ -3689,6 +3791,18 @@
"Node": "MIFTargetLoad",
"Duration": 0,
"Value": "20 80"
+ },
+ {
+ "PowerHint": "DISABLE_AMM",
+ "Node": "AutoMigrationMarginsEnable",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
+ "PowerHint": "DISABLE_AMM",
+ "Node": "AutoDvfsHeadroomEnable",
+ "Duration": 0,
+ "Value": "0"
}
],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index bbec9df..49fe3c4 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -193,4 +193,6 @@
false: firmware roaming will not be affected. -->
true
+
+ false