Snap for 10017868 from ab6b966924290364a45b48017b5e5d66708c9781 to udc-qpr1-release

Change-Id: I4ca9e6fcda4c18967fdedc6d6183ea05f92dca4e

OWNERS

@@ -1 +1,4 @@
 per-file powerhint.json = [email protected],[email protected],[email protected],[email protected]
+
+# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS

audio/lynx/aidl_config/audio_platform_configuration_aidl.xml

@@ -61,11 +61,16 @@
     <device type="speaker" codec_name="cs35l41" argu="SpeakerNum=4,Rotation,AcousticShockProtection" />
   </device_builder>
 
+  <!-- The spatial_capture_conditions: format is "use_case="x" audio_source="y" -->
+  <!-- use_case defines in aidl/audio/usecase/use_case.h, audio_source is definied in aidl interfaces. -->
+  <spatial_capture_conditions>
+    <conditions use_case="primary-capture" audio_source="MIC,CAMCORDER,VOICE_RECOGNITION" />
+  </spatial_capture_conditions>
+
   <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
   <tuner_builder>
-    <tuner type="playback" name="waves" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN" />
-    <tuner type="telephony" name="fortemedia"
-      argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y" />
+    <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />
+    <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" />
     <tuner type="capture" name="gs_capture" />
   </tuner_builder>
 </audio_platform_configuration>

audio/lynx/aidl_config/mixer_paths_aidl.xml

@@ -254,7 +254,6 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
-  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
 
   <!-- audio PDM mic default state -->
@@ -738,7 +737,6 @@
   </path>
 
   <path name="back-microphones">
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -757,8 +755,20 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (CAMCORDER)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
+    <ctl name="MIC DC Blocker" value="1"/>
+    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
+  </path>
+
+  <path name="back-microphones (CAMCORDER)">
+    <path name="microphones (CAMCORDER)" />
+  </path>
+
   <path name="camcorder-mic">
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />

audio/lynx/config/audio_platform_configuration.xml

@@ -286,7 +286,7 @@
 
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
-        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
+        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=192000,UnsupportedFormat=S24_LE,MaxCapPacketInterval=125,MaxCapSampleRate=192000,MaxCapBitWidth=32,MaxCapChannel=2,EnableHifi192kMultichannel=0"/>
     </device_handle>
 
     <external_module>

audio/lynx/tuning/fortemedia/BLUETOOTH.mods

@@ -1,7 +1,7 @@
 #PLATFORM_NAME  gChip
 #EXPORT_FLAG  BLUETOOTH
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2023-03-22 15:50:15
+#SAVE_TIME  2023-04-18 16:05:27
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
 #PARAM_MODE  FULL
@@ -2680,7 +2680,7 @@
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
-2    0x0073    //TX_PATCH_REG
+2    0x00F3    //TX_PATCH_REG
 3    0x6F7D    //TX_SENDFUNC_MODE_0
 4    0x0000    //TX_SENDFUNC_MODE_1
 5    0x0002    //TX_NUM_MIC
@@ -2875,10 +2875,10 @@
 194    0x0000    //TX_NORMENERTH
 195    0x0000    //TX_NORMENERHIGHTH
 196    0x0000    //TX_NORMENERHIGHTHL
-197    0x7FF0    //TX_DTD_THR1_0
-198    0x7FF0    //TX_DTD_THR1_1
+197    0x7333    //TX_DTD_THR1_0
+198    0x7333    //TX_DTD_THR1_1
 199    0x7FF0    //TX_DTD_THR1_2
-200    0x6D60    //TX_DTD_THR1_3
+200    0x7FF0    //TX_DTD_THR1_3
 201    0x7FF0    //TX_DTD_THR1_4
 202    0x7FF0    //TX_DTD_THR1_5
 203    0x7FF0    //TX_DTD_THR1_6
@@ -2922,7 +2922,7 @@
 241    0x0000    //TX_DT_RESRV_9
 242    0xF800    //TX_THR_SN_EST_0
 243    0xFA00    //TX_THR_SN_EST_1
-244    0xFA00    //TX_THR_SN_EST_2
+244    0xFC00    //TX_THR_SN_EST_2
 245    0xF200    //TX_THR_SN_EST_3
 246    0xFA00    //TX_THR_SN_EST_4
 247    0xFA00    //TX_THR_SN_EST_5
@@ -2931,7 +2931,7 @@
 250    0x0100    //TX_DELTA_THR_SN_EST_0
 251    0x0100    //TX_DELTA_THR_SN_EST_1
 252    0x0200    //TX_DELTA_THR_SN_EST_2
-253    0x0100    //TX_DELTA_THR_SN_EST_3
+253    0x0400    //TX_DELTA_THR_SN_EST_3
 254    0x0100    //TX_DELTA_THR_SN_EST_4
 255    0x0200    //TX_DELTA_THR_SN_EST_5
 256    0x0200    //TX_DELTA_THR_SN_EST_6
@@ -2968,20 +2968,20 @@
 287    0x0014    //TX_NS_LVL_CTRL_6
 288    0x0011    //TX_NS_LVL_CTRL_7
 289    0x000F    //TX_MIN_GAIN_S_0
-290    0x0010    //TX_MIN_GAIN_S_1
+290    0x0020    //TX_MIN_GAIN_S_1
 291    0x0010    //TX_MIN_GAIN_S_2
 292    0x0010    //TX_MIN_GAIN_S_3
 293    0x0010    //TX_MIN_GAIN_S_4
 294    0x0010    //TX_MIN_GAIN_S_5
 295    0x0010    //TX_MIN_GAIN_S_6
 296    0x000F    //TX_MIN_GAIN_S_7
-297    0x6000    //TX_NMOS_SUP
+297    0x2000    //TX_NMOS_SUP
 298    0x0000    //TX_NS_MAX_PRI_SNR_TH
 299    0x0000    //TX_NMOS_SUP_MENSA
-300    0x7FFF    //TX_SNRI_SUP_0
+300    0x4000    //TX_SNRI_SUP_0
 301    0x2000    //TX_SNRI_SUP_1
 302    0x2000    //TX_SNRI_SUP_2
-303    0x4000    //TX_SNRI_SUP_3
+303    0x2000    //TX_SNRI_SUP_3
 304    0x4000    //TX_SNRI_SUP_4
 305    0x50C0    //TX_SNRI_SUP_5
 306    0x2000    //TX_SNRI_SUP_6
@@ -2995,15 +2995,15 @@
 314    0x5000    //TX_A_POST_FILT_S_0
 315    0x4C00    //TX_A_POST_FILT_S_1
 316    0x4000    //TX_A_POST_FILT_S_2
-317    0x2000    //TX_A_POST_FILT_S_3
+317    0x6000    //TX_A_POST_FILT_S_3
 318    0x4000    //TX_A_POST_FILT_S_4
 319    0x5000    //TX_A_POST_FILT_S_5
 320    0x6000    //TX_A_POST_FILT_S_6
 321    0x7000    //TX_A_POST_FILT_S_7
 322    0x2000    //TX_B_POST_FILT_0
-323    0x2000    //TX_B_POST_FILT_1
+323    0x4000    //TX_B_POST_FILT_1
 324    0x2000    //TX_B_POST_FILT_2
-325    0x2000    //TX_B_POST_FILT_3
+325    0x7FFF    //TX_B_POST_FILT_3
 326    0x4000    //TX_B_POST_FILT_4
 327    0x1000    //TX_B_POST_FILT_5
 328    0x1000    //TX_B_POST_FILT_6
@@ -3018,9 +3018,9 @@
 337    0x7FFF    //TX_B_LESSCUT_RTO_S_7
 338    0x7C00    //TX_LAMBDA_PFILT
 339    0x7C00    //TX_LAMBDA_PFILT_S_0
-340    0x7C00    //TX_LAMBDA_PFILT_S_1
-341    0x7A00    //TX_LAMBDA_PFILT_S_2
-342    0x7800    //TX_LAMBDA_PFILT_S_3
+340    0x7E00    //TX_LAMBDA_PFILT_S_1
+341    0x7E00    //TX_LAMBDA_PFILT_S_2
+342    0x7D00    //TX_LAMBDA_PFILT_S_3
 343    0x7C00    //TX_LAMBDA_PFILT_S_4
 344    0x7C00    //TX_LAMBDA_PFILT_S_5
 345    0x7C00    //TX_LAMBDA_PFILT_S_6
@@ -3045,12 +3045,12 @@
 364    0x0000    //TX_K_APT
 365    0x0001    //TX_NOISEDET
 366    0x0064    //TX_NDETCT
-367    0x0032    //TX_NOISE_TH_0
+367    0x001E    //TX_NOISE_TH_0
 368    0x7FFF    //TX_NOISE_TH_0_2
 369    0x7FFF    //TX_NOISE_TH_0_3
 370    0x0320    //TX_NOISE_TH_1
-371    0x0230    //TX_NOISE_TH_2
-372    0x2CEC    //TX_NOISE_TH_3
+371    0x0384    //TX_NOISE_TH_2
+372    0x2904    //TX_NOISE_TH_3
 373    0x3E80    //TX_NOISE_TH_4
 374    0x7FFF    //TX_NOISE_TH_5
 375    0x7FFF    //TX_NOISE_TH_5_2
@@ -3084,7 +3084,7 @@
 403    0x4000    //TX_POST_MASK_SUP
 404    0x7FFF    //TX_POST_MASK_ADJUST
 405    0x00C8    //TX_NS_ENOISE_MIC0_TH
-406    0x0033    //TX_MINENOISE_MIC0_TH
+406    0x001E    //TX_MINENOISE_MIC0_TH
 407    0x012C    //TX_MINENOISE_MIC0_S_TH
 408    0x7FFF    //TX_MIN_G_CTRL_SSNS
 409    0x0000    //TX_METAL_RTO_THR
@@ -3622,8 +3622,8 @@
 941    0x0008    //TX_MIC1MUTE_CVG_TIME
 942    0x0008    //TX_MIC1MUTE_RELEASE_TIME
 943    0x0100    //TX_AMS_RESRV_01
-944    0xE4A8    //TX_AMS_RESRV_02
-945    0x7EF4    //TX_AMS_RESRV_03
+944    0xE0C0    //TX_AMS_RESRV_02
+945    0x2710    //TX_AMS_RESRV_03
 946    0x0000    //TX_AMS_RESRV_04
 947    0x0000    //TX_AMS_RESRV_05
 948    0x0000    //TX_AMS_RESRV_06

audio/lynx/tuning/fortemedia/HANDSFREE.mods

@@ -1,7 +1,7 @@
 #PLATFORM_NAME  gChip
 #EXPORT_FLAG  HANDSFREE
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2023-03-22 15:41:43
+#SAVE_TIME  2023-04-18 16:04:40
 
 #CASE_NAME  HANDSFREE-HANDSFREE-VOICE_GENERIC-NB
 #PARAM_MODE  FULL
@@ -2680,7 +2680,7 @@
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
-2    0x0073    //TX_PATCH_REG
+2    0x00F3    //TX_PATCH_REG
 3    0x6F7D    //TX_SENDFUNC_MODE_0
 4    0x0000    //TX_SENDFUNC_MODE_1
 5    0x0002    //TX_NUM_MIC
@@ -2875,8 +2875,8 @@
 194    0x0000    //TX_NORMENERTH
 195    0x0000    //TX_NORMENERHIGHTH
 196    0x0000    //TX_NORMENERHIGHTHL
-197    0x7FD5    //TX_DTD_THR1_0
-198    0x7EF4    //TX_DTD_THR1_1
+197    0x7333    //TX_DTD_THR1_0
+198    0x7333    //TX_DTD_THR1_1
 199    0x7FF0    //TX_DTD_THR1_2
 200    0x7FF0    //TX_DTD_THR1_3
 201    0x7FF0    //TX_DTD_THR1_4
@@ -2922,7 +2922,7 @@
 241    0x0000    //TX_DT_RESRV_9
 242    0xF800    //TX_THR_SN_EST_0
 243    0xFA00    //TX_THR_SN_EST_1
-244    0xFA00    //TX_THR_SN_EST_2
+244    0xFC00    //TX_THR_SN_EST_2
 245    0xF200    //TX_THR_SN_EST_3
 246    0xFA00    //TX_THR_SN_EST_4
 247    0xFA00    //TX_THR_SN_EST_5
@@ -2931,7 +2931,7 @@
 250    0x0100    //TX_DELTA_THR_SN_EST_0
 251    0x0100    //TX_DELTA_THR_SN_EST_1
 252    0x0200    //TX_DELTA_THR_SN_EST_2
-253    0x0100    //TX_DELTA_THR_SN_EST_3
+253    0x0400    //TX_DELTA_THR_SN_EST_3
 254    0x0100    //TX_DELTA_THR_SN_EST_4
 255    0x0200    //TX_DELTA_THR_SN_EST_5
 256    0x0200    //TX_DELTA_THR_SN_EST_6
@@ -2968,20 +2968,20 @@
 287    0x0014    //TX_NS_LVL_CTRL_6
 288    0x0011    //TX_NS_LVL_CTRL_7
 289    0x000F    //TX_MIN_GAIN_S_0
-290    0x0010    //TX_MIN_GAIN_S_1
+290    0x0020    //TX_MIN_GAIN_S_1
 291    0x0010    //TX_MIN_GAIN_S_2
 292    0x0010    //TX_MIN_GAIN_S_3
 293    0x0010    //TX_MIN_GAIN_S_4
 294    0x0010    //TX_MIN_GAIN_S_5
 295    0x0010    //TX_MIN_GAIN_S_6
 296    0x000F    //TX_MIN_GAIN_S_7
-297    0x6000    //TX_NMOS_SUP
+297    0x2000    //TX_NMOS_SUP
 298    0x0000    //TX_NS_MAX_PRI_SNR_TH
 299    0x0000    //TX_NMOS_SUP_MENSA
-300    0x7FFF    //TX_SNRI_SUP_0
+300    0x4000    //TX_SNRI_SUP_0
 301    0x2000    //TX_SNRI_SUP_1
 302    0x2000    //TX_SNRI_SUP_2
-303    0x4000    //TX_SNRI_SUP_3
+303    0x2000    //TX_SNRI_SUP_3
 304    0x4000    //TX_SNRI_SUP_4
 305    0x50C0    //TX_SNRI_SUP_5
 306    0x2000    //TX_SNRI_SUP_6
@@ -2995,15 +2995,15 @@
 314    0x5000    //TX_A_POST_FILT_S_0
 315    0x4C00    //TX_A_POST_FILT_S_1
 316    0x4000    //TX_A_POST_FILT_S_2
-317    0x2000    //TX_A_POST_FILT_S_3
+317    0x6000    //TX_A_POST_FILT_S_3
 318    0x4000    //TX_A_POST_FILT_S_4
 319    0x5000    //TX_A_POST_FILT_S_5
 320    0x6000    //TX_A_POST_FILT_S_6
 321    0x7000    //TX_A_POST_FILT_S_7
 322    0x2000    //TX_B_POST_FILT_0
-323    0x2000    //TX_B_POST_FILT_1
+323    0x4000    //TX_B_POST_FILT_1
 324    0x2000    //TX_B_POST_FILT_2
-325    0x2000    //TX_B_POST_FILT_3
+325    0x7FFF    //TX_B_POST_FILT_3
 326    0x4000    //TX_B_POST_FILT_4
 327    0x1000    //TX_B_POST_FILT_5
 328    0x1000    //TX_B_POST_FILT_6
@@ -3018,9 +3018,9 @@
 337    0x7FFF    //TX_B_LESSCUT_RTO_S_7
 338    0x7C00    //TX_LAMBDA_PFILT
 339    0x7C00    //TX_LAMBDA_PFILT_S_0
-340    0x7C00    //TX_LAMBDA_PFILT_S_1
-341    0x7A00    //TX_LAMBDA_PFILT_S_2
-342    0x7800    //TX_LAMBDA_PFILT_S_3
+340    0x7E00    //TX_LAMBDA_PFILT_S_1
+341    0x7E00    //TX_LAMBDA_PFILT_S_2
+342    0x7D00    //TX_LAMBDA_PFILT_S_3
 343    0x7C00    //TX_LAMBDA_PFILT_S_4
 344    0x7C00    //TX_LAMBDA_PFILT_S_5
 345    0x7C00    //TX_LAMBDA_PFILT_S_6
@@ -3045,12 +3045,12 @@
 364    0x0000    //TX_K_APT
 365    0x0001    //TX_NOISEDET
 366    0x0064    //TX_NDETCT
-367    0x0032    //TX_NOISE_TH_0
+367    0x001E    //TX_NOISE_TH_0
 368    0x7FFF    //TX_NOISE_TH_0_2
 369    0x7FFF    //TX_NOISE_TH_0_3
 370    0x0320    //TX_NOISE_TH_1
-371    0x0230    //TX_NOISE_TH_2
-372    0x2CEC    //TX_NOISE_TH_3
+371    0x0384    //TX_NOISE_TH_2
+372    0x2904    //TX_NOISE_TH_3
 373    0x3E80    //TX_NOISE_TH_4
 374    0x7FFF    //TX_NOISE_TH_5
 375    0x7FFF    //TX_NOISE_TH_5_2
@@ -3084,7 +3084,7 @@
 403    0x4000    //TX_POST_MASK_SUP
 404    0x7FFF    //TX_POST_MASK_ADJUST
 405    0x00C8    //TX_NS_ENOISE_MIC0_TH
-406    0x0033    //TX_MINENOISE_MIC0_TH
+406    0x001E    //TX_MINENOISE_MIC0_TH
 407    0x012C    //TX_MINENOISE_MIC0_S_TH
 408    0x7FFF    //TX_MIN_G_CTRL_SSNS
 409    0x0000    //TX_METAL_RTO_THR

audio/lynx/tuning/fortemedia/HEADSET.mods

@@ -1,7 +1,7 @@
 #PLATFORM_NAME  gChip
 #EXPORT_FLAG  HEADSET
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2023-03-22 15:50:48
+#SAVE_TIME  2023-04-18 16:05:05
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
 #PARAM_MODE  FULL
@@ -29380,7 +29380,7 @@
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
-2    0x0073    //TX_PATCH_REG
+2    0x00F3    //TX_PATCH_REG
 3    0x6F7D    //TX_SENDFUNC_MODE_0
 4    0x0000    //TX_SENDFUNC_MODE_1
 5    0x0002    //TX_NUM_MIC
@@ -29575,10 +29575,10 @@
 194    0x0000    //TX_NORMENERTH
 195    0x0000    //TX_NORMENERHIGHTH
 196    0x0000    //TX_NORMENERHIGHTHL
-197    0x7FF0    //TX_DTD_THR1_0
-198    0x7FF0    //TX_DTD_THR1_1
+197    0x7333    //TX_DTD_THR1_0
+198    0x7333    //TX_DTD_THR1_1
 199    0x7FF0    //TX_DTD_THR1_2
-200    0x6D60    //TX_DTD_THR1_3
+200    0x7FF0    //TX_DTD_THR1_3
 201    0x7FF0    //TX_DTD_THR1_4
 202    0x7FF0    //TX_DTD_THR1_5
 203    0x7FF0    //TX_DTD_THR1_6
@@ -29622,7 +29622,7 @@
 241    0x0000    //TX_DT_RESRV_9
 242    0xF800    //TX_THR_SN_EST_0
 243    0xFA00    //TX_THR_SN_EST_1
-244    0xFA00    //TX_THR_SN_EST_2
+244    0xFC00    //TX_THR_SN_EST_2
 245    0xF200    //TX_THR_SN_EST_3
 246    0xFA00    //TX_THR_SN_EST_4
 247    0xFA00    //TX_THR_SN_EST_5
@@ -29631,7 +29631,7 @@
 250    0x0100    //TX_DELTA_THR_SN_EST_0
 251    0x0100    //TX_DELTA_THR_SN_EST_1
 252    0x0200    //TX_DELTA_THR_SN_EST_2
-253    0x0100    //TX_DELTA_THR_SN_EST_3
+253    0x0400    //TX_DELTA_THR_SN_EST_3
 254    0x0100    //TX_DELTA_THR_SN_EST_4
 255    0x0200    //TX_DELTA_THR_SN_EST_5
 256    0x0200    //TX_DELTA_THR_SN_EST_6
@@ -29668,20 +29668,20 @@
 287    0x0014    //TX_NS_LVL_CTRL_6
 288    0x0011    //TX_NS_LVL_CTRL_7
 289    0x000F    //TX_MIN_GAIN_S_0
-290    0x0010    //TX_MIN_GAIN_S_1
+290    0x0020    //TX_MIN_GAIN_S_1
 291    0x0010    //TX_MIN_GAIN_S_2
 292    0x0010    //TX_MIN_GAIN_S_3
 293    0x0010    //TX_MIN_GAIN_S_4
 294    0x0010    //TX_MIN_GAIN_S_5
 295    0x0010    //TX_MIN_GAIN_S_6
 296    0x000F    //TX_MIN_GAIN_S_7
-297    0x6000    //TX_NMOS_SUP
+297    0x2000    //TX_NMOS_SUP
 298    0x0000    //TX_NS_MAX_PRI_SNR_TH
 299    0x0000    //TX_NMOS_SUP_MENSA
-300    0x7FFF    //TX_SNRI_SUP_0
+300    0x4000    //TX_SNRI_SUP_0
 301    0x2000    //TX_SNRI_SUP_1
 302    0x2000    //TX_SNRI_SUP_2
-303    0x4000    //TX_SNRI_SUP_3
+303    0x2000    //TX_SNRI_SUP_3
 304    0x4000    //TX_SNRI_SUP_4
 305    0x50C0    //TX_SNRI_SUP_5
 306    0x2000    //TX_SNRI_SUP_6
@@ -29695,15 +29695,15 @@
 314    0x5000    //TX_A_POST_FILT_S_0
 315    0x4C00    //TX_A_POST_FILT_S_1
 316    0x4000    //TX_A_POST_FILT_S_2
-317    0x2000    //TX_A_POST_FILT_S_3
+317    0x6000    //TX_A_POST_FILT_S_3
 318    0x4000    //TX_A_POST_FILT_S_4
 319    0x5000    //TX_A_POST_FILT_S_5
 320    0x6000    //TX_A_POST_FILT_S_6
 321    0x7000    //TX_A_POST_FILT_S_7
 322    0x2000    //TX_B_POST_FILT_0
-323    0x2000    //TX_B_POST_FILT_1
+323    0x4000    //TX_B_POST_FILT_1
 324    0x2000    //TX_B_POST_FILT_2
-325    0x2000    //TX_B_POST_FILT_3
+325    0x7FFF    //TX_B_POST_FILT_3
 326    0x4000    //TX_B_POST_FILT_4
 327    0x1000    //TX_B_POST_FILT_5
 328    0x1000    //TX_B_POST_FILT_6
@@ -29718,9 +29718,9 @@
 337    0x7FFF    //TX_B_LESSCUT_RTO_S_7
 338    0x7C00    //TX_LAMBDA_PFILT
 339    0x7C00    //TX_LAMBDA_PFILT_S_0
-340    0x7C00    //TX_LAMBDA_PFILT_S_1
-341    0x7A00    //TX_LAMBDA_PFILT_S_2
-342    0x7800    //TX_LAMBDA_PFILT_S_3
+340    0x7E00    //TX_LAMBDA_PFILT_S_1
+341    0x7E00    //TX_LAMBDA_PFILT_S_2
+342    0x7D00    //TX_LAMBDA_PFILT_S_3
 343    0x7C00    //TX_LAMBDA_PFILT_S_4
 344    0x7C00    //TX_LAMBDA_PFILT_S_5
 345    0x7C00    //TX_LAMBDA_PFILT_S_6
@@ -29745,12 +29745,12 @@
 364    0x0000    //TX_K_APT
 365    0x0001    //TX_NOISEDET
 366    0x0064    //TX_NDETCT
-367    0x0032    //TX_NOISE_TH_0
+367    0x001E    //TX_NOISE_TH_0
 368    0x7FFF    //TX_NOISE_TH_0_2
 369    0x7FFF    //TX_NOISE_TH_0_3
 370    0x0320    //TX_NOISE_TH_1
-371    0x0230    //TX_NOISE_TH_2
-372    0x2CEC    //TX_NOISE_TH_3
+371    0x0384    //TX_NOISE_TH_2
+372    0x2904    //TX_NOISE_TH_3
 373    0x3E80    //TX_NOISE_TH_4
 374    0x7FFF    //TX_NOISE_TH_5
 375    0x7FFF    //TX_NOISE_TH_5_2
@@ -29784,7 +29784,7 @@
 403    0x4000    //TX_POST_MASK_SUP
 404    0x7FFF    //TX_POST_MASK_ADJUST
 405    0x00C8    //TX_NS_ENOISE_MIC0_TH
-406    0x0033    //TX_MINENOISE_MIC0_TH
+406    0x001E    //TX_MINENOISE_MIC0_TH
 407    0x012C    //TX_MINENOISE_MIC0_S_TH
 408    0x7FFF    //TX_MIN_G_CTRL_SSNS
 409    0x0000    //TX_METAL_RTO_THR
@@ -30322,8 +30322,8 @@
 941    0x0008    //TX_MIC1MUTE_CVG_TIME
 942    0x0008    //TX_MIC1MUTE_RELEASE_TIME
 943    0x0100    //TX_AMS_RESRV_01
-944    0xE4A8    //TX_AMS_RESRV_02
-945    0x7EF4    //TX_AMS_RESRV_03
+944    0xE0C0    //TX_AMS_RESRV_02
+945    0x2710    //TX_AMS_RESRV_03
 946    0x0000    //TX_AMS_RESRV_04
 947    0x0000    //TX_AMS_RESRV_05
 948    0x0000    //TX_AMS_RESRV_06
@@ -69430,7 +69430,7 @@
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
-2    0x0073    //TX_PATCH_REG
+2    0x00F3    //TX_PATCH_REG
 3    0x6F7D    //TX_SENDFUNC_MODE_0
 4    0x0000    //TX_SENDFUNC_MODE_1
 5    0x0002    //TX_NUM_MIC
@@ -69625,10 +69625,10 @@
 194    0x0000    //TX_NORMENERTH
 195    0x0000    //TX_NORMENERHIGHTH
 196    0x0000    //TX_NORMENERHIGHTHL
-197    0x7FF0    //TX_DTD_THR1_0
-198    0x7FF0    //TX_DTD_THR1_1
+197    0x7333    //TX_DTD_THR1_0
+198    0x7333    //TX_DTD_THR1_1
 199    0x7FF0    //TX_DTD_THR1_2
-200    0x6D60    //TX_DTD_THR1_3
+200    0x7FF0    //TX_DTD_THR1_3
 201    0x7FF0    //TX_DTD_THR1_4
 202    0x7FF0    //TX_DTD_THR1_5
 203    0x7FF0    //TX_DTD_THR1_6
@@ -69672,7 +69672,7 @@
 241    0x0000    //TX_DT_RESRV_9
 242    0xF800    //TX_THR_SN_EST_0
 243    0xFA00    //TX_THR_SN_EST_1
-244    0xFA00    //TX_THR_SN_EST_2
+244    0xFC00    //TX_THR_SN_EST_2
 245    0xF200    //TX_THR_SN_EST_3
 246    0xFA00    //TX_THR_SN_EST_4
 247    0xFA00    //TX_THR_SN_EST_5
@@ -69681,7 +69681,7 @@
 250    0x0100    //TX_DELTA_THR_SN_EST_0
 251    0x0100    //TX_DELTA_THR_SN_EST_1
 252    0x0200    //TX_DELTA_THR_SN_EST_2
-253    0x0100    //TX_DELTA_THR_SN_EST_3
+253    0x0400    //TX_DELTA_THR_SN_EST_3
 254    0x0100    //TX_DELTA_THR_SN_EST_4
 255    0x0200    //TX_DELTA_THR_SN_EST_5
 256    0x0200    //TX_DELTA_THR_SN_EST_6
@@ -69718,20 +69718,20 @@
 287    0x0014    //TX_NS_LVL_CTRL_6
 288    0x0011    //TX_NS_LVL_CTRL_7
 289    0x000F    //TX_MIN_GAIN_S_0
-290    0x0010    //TX_MIN_GAIN_S_1
+290    0x0020    //TX_MIN_GAIN_S_1
 291    0x0010    //TX_MIN_GAIN_S_2
 292    0x0010    //TX_MIN_GAIN_S_3
 293    0x0010    //TX_MIN_GAIN_S_4
 294    0x0010    //TX_MIN_GAIN_S_5
 295    0x0010    //TX_MIN_GAIN_S_6
 296    0x000F    //TX_MIN_GAIN_S_7
-297    0x6000    //TX_NMOS_SUP
+297    0x2000    //TX_NMOS_SUP
 298    0x0000    //TX_NS_MAX_PRI_SNR_TH
 299    0x0000    //TX_NMOS_SUP_MENSA
-300    0x7FFF    //TX_SNRI_SUP_0
+300    0x4000    //TX_SNRI_SUP_0
 301    0x2000    //TX_SNRI_SUP_1
 302    0x2000    //TX_SNRI_SUP_2
-303    0x4000    //TX_SNRI_SUP_3
+303    0x2000    //TX_SNRI_SUP_3
 304    0x4000    //TX_SNRI_SUP_4
 305    0x50C0    //TX_SNRI_SUP_5
 306    0x2000    //TX_SNRI_SUP_6
@@ -69745,15 +69745,15 @@
 314    0x5000    //TX_A_POST_FILT_S_0
 315    0x4C00    //TX_A_POST_FILT_S_1
 316    0x4000    //TX_A_POST_FILT_S_2
-317    0x2000    //TX_A_POST_FILT_S_3
+317    0x6000    //TX_A_POST_FILT_S_3
 318    0x4000    //TX_A_POST_FILT_S_4
 319    0x5000    //TX_A_POST_FILT_S_5
 320    0x6000    //TX_A_POST_FILT_S_6
 321    0x7000    //TX_A_POST_FILT_S_7
 322    0x2000    //TX_B_POST_FILT_0
-323    0x2000    //TX_B_POST_FILT_1
+323    0x4000    //TX_B_POST_FILT_1
 324    0x2000    //TX_B_POST_FILT_2
-325    0x2000    //TX_B_POST_FILT_3
+325    0x7FFF    //TX_B_POST_FILT_3
 326    0x4000    //TX_B_POST_FILT_4
 327    0x1000    //TX_B_POST_FILT_5
 328    0x1000    //TX_B_POST_FILT_6
@@ -69768,9 +69768,9 @@
 337    0x7FFF    //TX_B_LESSCUT_RTO_S_7
 338    0x7C00    //TX_LAMBDA_PFILT
 339    0x7C00    //TX_LAMBDA_PFILT_S_0
-340    0x7C00    //TX_LAMBDA_PFILT_S_1
-341    0x7A00    //TX_LAMBDA_PFILT_S_2
-342    0x7800    //TX_LAMBDA_PFILT_S_3
+340    0x7E00    //TX_LAMBDA_PFILT_S_1
+341    0x7E00    //TX_LAMBDA_PFILT_S_2
+342    0x7D00    //TX_LAMBDA_PFILT_S_3
 343    0x7C00    //TX_LAMBDA_PFILT_S_4
 344    0x7C00    //TX_LAMBDA_PFILT_S_5
 345    0x7C00    //TX_LAMBDA_PFILT_S_6
@@ -69795,12 +69795,12 @@
 364    0x0000    //TX_K_APT
 365    0x0001    //TX_NOISEDET
 366    0x0064    //TX_NDETCT
-367    0x0032    //TX_NOISE_TH_0
+367    0x001E    //TX_NOISE_TH_0
 368    0x7FFF    //TX_NOISE_TH_0_2
 369    0x7FFF    //TX_NOISE_TH_0_3
 370    0x0320    //TX_NOISE_TH_1
-371    0x0230    //TX_NOISE_TH_2
-372    0x2CEC    //TX_NOISE_TH_3
+371    0x0384    //TX_NOISE_TH_2
+372    0x2904    //TX_NOISE_TH_3
 373    0x3E80    //TX_NOISE_TH_4
 374    0x7FFF    //TX_NOISE_TH_5
 375    0x7FFF    //TX_NOISE_TH_5_2
@@ -69834,7 +69834,7 @@
 403    0x4000    //TX_POST_MASK_SUP
 404    0x7FFF    //TX_POST_MASK_ADJUST
 405    0x00C8    //TX_NS_ENOISE_MIC0_TH
-406    0x0033    //TX_MINENOISE_MIC0_TH
+406    0x001E    //TX_MINENOISE_MIC0_TH
 407    0x012C    //TX_MINENOISE_MIC0_S_TH
 408    0x7FFF    //TX_MIN_G_CTRL_SSNS
 409    0x0000    //TX_METAL_RTO_THR
@@ -70372,8 +70372,8 @@
 941    0x0008    //TX_MIC1MUTE_CVG_TIME
 942    0x0008    //TX_MIC1MUTE_RELEASE_TIME
 943    0x0100    //TX_AMS_RESRV_01
-944    0xE4A8    //TX_AMS_RESRV_02
-945    0x7EF4    //TX_AMS_RESRV_03
+944    0xE0C0    //TX_AMS_RESRV_02
+945    0x2710    //TX_AMS_RESRV_03
 946    0x0000    //TX_AMS_RESRV_04
 947    0x0000    //TX_AMS_RESRV_05
 948    0x0000    //TX_AMS_RESRV_06

bluetooth/le_audio_codec_capabilities.xml

@@ -32,9 +32,6 @@
     <scenario encode="OneChanMono_24_2" decode="invalid"/>
     <scenario encode="TwoChanStereo_24_2" decode="invalid"/>
     <scenario encode="OneChanStereo_24_2" decode="invalid"/>
-    <scenario encode="OneChanMono_32_2" decode="invalid"/>
-    <scenario encode="TwoChanStereo_32_2" decode="invalid"/>
-    <scenario encode="OneChanStereo_32_2" decode="invalid"/>
     <scenario encode="OneChanMono_48_4" decode="invalid"/>
     <scenario encode="TwoChanStereo_48_4" decode="invalid"/>
     <scenario encode="OneChanStereo_48_4" decode="invalid"/>
@@ -47,8 +44,6 @@
     <scenario encode="OneChanStereo_16_2" decode="OneChanMono_16_2"/>
     <scenario encode="TwoChanStereo_16_2" decode="OneChanMono_16_2"/>
     <scenario encode="OneChanMono_16_2" decode="OneChanMono_16_2"/>
-    <scenario encode="OneChanStereo_32_2" decode="OneChanStereo_32_2"/>
-    <scenario encode="OneChanStereo_32_2" decode="OneChanMono_32_2"/>
     <scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
     <scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
     <!-- broadcast -->
@@ -67,7 +62,6 @@
     <configuration name="OneChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
     <configuration name="OneChanMono_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
     <configuration name="TwoChanStereo_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
-    <configuration name="OneChanStereo_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
     <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
     <configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
     <configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>

device-lynx.mk

@@ -279,8 +279,3 @@ PRODUCT_PACKAGES += \
     SettingsOverlayG0DZQ \
     SettingsOverlayGHL1X \
     SettingsOverlayGWKK3
-
-# Setup Wizard device-specific settings
-PRODUCT_PRODUCT_PROPERTIES += \
-    setupwizard.feature.enable_quick_start_flow_for_debug=true \
-

powerhint.json

@@ -1,5 +1,18 @@
 {
   "Nodes": [
+    {
+      "Name": "GPUMinFreq",
+      "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
+      "Values": [
+        "848000",
+        "762000",
+        "572000",
+        "471000",
+        "302000",
+        "202000"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "MemFreq",
       "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq",
@@ -104,19 +117,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "GPUMinFreq",
-      "Path": "/sys/devices/platform/28000000.mali/hint_min_freq",
-      "Values": [
-        "848000",
-        "762000",
-        "572000",
-        "471000",
-        "302000",
-        "202000"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "ReducePreferIdle",
       "Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -150,7 +150,7 @@
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/cam_uclamp_min",
       "Values": [
-        "612",
+        "764",
         "0"
       ],
       "ResetOnInit": true
@@ -159,7 +159,7 @@
       "Name": "TAUClampBoost",
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
-        "612",
+        "764",
         "1"
       ],
       "ResetOnInit": true
@@ -177,8 +177,8 @@
       "Name": "MLUclampBoost",
       "Path": "/proc/vendor_sched/nnapi_uclamp_min",
       "Values": [
-          "180",
-          "650"
+          "225",
+          "813"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -654,7 +654,7 @@
       "PowerHint": "LAUNCH",
       "Node": "TAUClampBoost",
       "Duration": 5000,
-      "Value": "612"
+      "Value": "764"
     },
     {
       "PowerHint": "LAUNCH",
@@ -721,6 +721,12 @@
       "Duration": 2000,
       "Value": "9999999"
     },
+    {
+      "PowerHint": "CPU_LOAD_RESET",
+      "Node": "GPUMinFreq",
+      "Duration": 50,
+      "Value": "302000"
+    },
     {
       "PowerHint": "CPU_LOAD_RESET",
       "Node": "MemFreq",
@@ -773,7 +779,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CAMUClampBoost",
       "Duration": 1000,
-      "Value": "612"
+      "Value": "764"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1443,6 +1449,66 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
     {
       "PowerHint": "REFRESH_90FPS",
       "Node": "TAUClampBoost",
@@ -1508,12 +1574,6 @@
       "Duration": 0,
       "Value": "572000"
     },
-    {
-      "PowerHint": "ADPF_FIRST_FRAME",
-      "Node": "GPUMinFreq",
-      "Duration": 50,
-      "Value": "302000"
-    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "PMU_POLL",
@@ -1986,7 +2046,7 @@
       "PowerHint": "ML_ACC",
       "Node": "MLUclampBoost",
       "Duration": 2000,
-      "Value": "650"
+      "Value": "813"
     },
     {
       "PowerHint": "ML_ACC",
@@ -2008,8 +2068,8 @@
       "PID_Do": 500.0,
       "PID_Du": 0.0,
       "UclampMin_On": true,
-      "UclampMin_Init": 185,
-      "UclampMin_High": 384,
+      "UclampMin_Init": 232,
+      "UclampMin_High": 480,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
@@ -2032,8 +2092,8 @@
       "PID_Do": 500.0,
       "PID_Du": 0.0,
       "UclampMin_On": true,
-      "UclampMin_Init": 129,
-      "UclampMin_High": 384,
+      "UclampMin_Init": 162,
+      "UclampMin_High": 480,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
@@ -2056,8 +2116,8 @@
       "PID_Do": 500.0,
       "PID_Du": 0.0,
       "UclampMin_On": true,
-      "UclampMin_Init": 129,
-      "UclampMin_High": 384,
+      "UclampMin_Init": 162,
+      "UclampMin_High": 480,
       "UclampMin_Low": 2,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
@@ -2083,9 +2143,9 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
-      "UclampMin_Init": 200,
-      "UclampMin_High": 157,
-      "UclampMin_Low": 157,
+      "UclampMin_Init": 250,
+      "UclampMin_High": 197,
+      "UclampMin_Low": 197,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -2107,9 +2167,9 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
-      "UclampMin_Init": 200,
-      "UclampMin_High": 42,
-      "UclampMin_Low": 42,
+      "UclampMin_Init": 250,
+      "UclampMin_High": 53,
+      "UclampMin_Low": 53,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -2131,7 +2191,7 @@
       "SamplingWindow_I": 1,
       "SamplingWindow_D": 1,
       "UclampMin_On": true,
-      "UclampMin_Init": 200,
+      "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
       "ReportingRateLimitNs": 1,

rro_overlays/WifiOverlay/res/values/config.xml

@@ -150,4 +150,10 @@
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>
+
+    <!-- Boolean indicating whether the framework updates country from scan results when there is
+         no telephony country code. This is applied to all generic cases and might require the
+         regulatory approval (for example, FCC pre-approval is required according to "594280 D01
+         Software Configuration Control v02r01").-->
+    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultGeneric">true</bool>
 </resources>