Snap for 12462067 from b69c09a118 to mainline-tzdata6-release

Change-Id: If17b1a56b277a50f1f2b15b04b204a82eb0851a8

aosp_husky_pgagnostic.mk

@@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
 TARGET_BOOTS_16K := true

aosp_shiba_pgagnostic.mk

@@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
 TARGET_BOOTS_16K := true

audio/husky/aidl_config/audio_platform_configuration.xml

@@ -24,10 +24,13 @@
       <argument name="PollWaitMs" value="20000" />
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="ThermistorType" value="UNKNOWN" />
-      <argument name="ThrottlingSeverity" value="MODERATE" />
+      <argument name="ThrottlingSeverity" value="LIGHT" />
     </feature>
     <feature name="RuntimeTuningDump" />
-    <!-- <feature name="spatializer-offload" /> -->
+    <feature name="SoundDose">
+      <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
+    </feature>
+    <feature name="spatializer-offload" />
   </features>
 
   <voipVolume>
@@ -47,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
@@ -58,11 +60,12 @@
       <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
     </tuner>
     <tuner type="telephony" name="fortemedia">
-      <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
+      <argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
       <argument name="VoIP_Rate" value="32000" />
       <argument name="BOOST_USB_SWB_CLK" value="y" />
       <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
+      <argument name="MCPS_TABLE" value="y" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
   </tuners>
@@ -71,8 +74,8 @@
     <latency source="primary-playback" sink="speaker" milliseconds="20" />
     <latency source="primary-playback" sink="usb-device" milliseconds="10" />
     <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
 
     <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
     <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -89,18 +92,18 @@
     <latency source="microphones" sink="primary-capture" milliseconds="160" />
     <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
     <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
+    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
+    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
   </latencies>
 
   <spatialCapture>
     <enablement useCase="primary-capture" deviceInterface="microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
     <enablement useCase="primary-capture" deviceInterface="back-microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
   </spatialCapture>
 

audio/husky/aidl_config/mixer_paths_aidl.xml

@@ -233,6 +233,7 @@
   <ctl name="EP6 TX Mixer INCALL_TX" value="0" />
   <ctl name="NoHost1 TX Mixer INCALL_TX" value="0" />
 
+  <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="0"/>
   <ctl name="EP4 TX Mixer I2S_2_TX" value="0" />
 
   <!-- AoC Mic setting -->
@@ -256,10 +257,14 @@
 
   <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" />
   <ctl name="Hotword Tap Enable" value="0" />
 
+  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
+  <!-- crashing since speicifc order is needed between dsp mode and"        -->
+  <!-- spatial module."                                                     -->
+  <ctl name="Mic Spatial Module Enable" value="0" />
+
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@@ -307,6 +312,7 @@
   <ctl name="Incall Capture Stream0" value="Off" />
   <ctl name="Incall Capture Stream1" value="Off" />
   <ctl name="Incall Capture Stream2" value="Off" />
+  <ctl name="Incall Capture Stream3" value="Off" />
 
   <!-- These two controls control the muting function of mics and sinks during the voice call. -->
   <!-- They would be enabled by HAL. -->
@@ -413,6 +419,10 @@
     <path name="primary-playback -> bt" />
   </path>
 
+  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -485,6 +495,10 @@
     <path name="raw-playback -> bt" />
   </path>
 
+  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -557,6 +571,10 @@
     <path name="deep-buffer-playback -> bt" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -634,6 +652,10 @@
     <path name="compress-offload-playback -> bt" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -706,6 +728,10 @@
     <path name="mmap-playback -> bt" />
   </path>
 
+  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -790,6 +816,10 @@
     <path name="voip-playback -> bt" />
   </path>
 
+  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -806,61 +836,6 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
-  <path name="immersive-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker-earpiece">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker-safe">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback -> bt">
-    <ctl name="BT_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> bt">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-low-energy-headset">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb">
-    <ctl name="USB_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb-headset">
-    <path name="immersive-playback-0 -> usb" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb-device">
-    <path name="immersive-playback-0 -> usb" />
-  </path>
 
   <path name="spatializer-offload-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP4" value="1" />
@@ -882,6 +857,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>
@@ -902,6 +889,10 @@
     <path name="spatializer-offload-playback -> bt" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
@@ -972,6 +963,10 @@
     <path name="haptic-playback -> bt" />
   </path>
 
+  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1046,6 +1041,39 @@
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -1074,11 +1102,47 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="Hotword Tap Enable" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
 
-  <path name="microphones -> hotword-lookback-capture-0" />
+  <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
+
+  <path name="ultrasound-microphones -> ultrasound-capture-0">
+    <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
+  </path>
+
+  <path name="microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> mmap-capture-0">
+    <path name="microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1113,6 +1177,10 @@
     <path name="voice-call-downlink-0 -> bt" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
@@ -1165,77 +1233,9 @@
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
   </path>
 
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
+  <path name="in-call-capture-source-0 -> in-call-capture-0" />
-    <ctl name="Incall Capture Stream0" value="DL" />
+  <path name="in-call-capture-source-1 -> in-call-capture-1" />
-  </path>
+  <path name="in-call-capture-source-2 -> in-call-capture-2" />
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="usb-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="usb-headset-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="usb-device-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
 
   <!-- codec setting -->
   <!-- Rx device -->
@@ -1249,7 +1249,6 @@
     <ctl name="PCM Source" value="ASP" />
     <ctl name="AMP PCM Gain" value="7" />
     <ctl name="Main AMP Enable Switch" value="1" />
-    <ctl name="AoC Chirp Enable" value="1" />
   </path>
 
   <path name="speaker">
@@ -1266,7 +1265,6 @@
     <ctl name="R ASPTX1 Slot Position" value="0" />
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
-    <!-- load Enable FIR -->
     <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
@@ -1275,36 +1273,35 @@
 
   <path name="speaker-safe">
     <ctl name="R Main AMP Enable Switch" value="1" />
-    <!-- load Bypass FIR -->
-    <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
   </path>
 
   <!-- Tx device -->
-  <path name="microphones">
+  <path name="builtin-mic-id-capture-list">
     <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="1" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+  </path>
+
+  <path name="microphones">
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
   <path name="microphones (VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="builtin-mic-id-capture-list" />
-    <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 HW Gain At High Power Mode (cB)" value="130" />
     <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)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="22" />
   </path>
@@ -1316,91 +1313,47 @@
   </path>
 
   <path name="microphones (SOUND_TRIGGER_AEC)">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="Audio Capture Eraser Enable" value="1" />
     <ctl name="Audio Capture Mic Source" value="ERASER" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="back-microphones">
+  <path name="microphones (CAMCORDER)">
-    <ctl name="Mic Spatial Module Enable" value="1" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="22" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
+  <path name="microphones (UNPROCESSED)">
+    <path name="builtin-mic-id-capture-list" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="5" />
+  </path>
+
+  <path name="back-microphones">
+    <path name="microphones" />
   </path>
 
   <path name="back-microphones (VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="microphones (VOICE)" />
-    <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 HW Gain At High Power Mode (cB)" value="130" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="microphones (CAMCORDER)">
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="back-microphones (VOICE)" />
-    <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">
+  <path name="back-microphones (UNPROCESSED)">
-    <ctl name="Mic Spatial Module Enable" value="1" />
+    <path name="microphones (UNPROCESSED)" />
-    <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="unprocessed-mic">
-    <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="5" />
-  </path>
-
-  <path name="unprocessed-dual-mic">
-    <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="5" />
-  </path>
-
-  <path name="unprocessed-triple-mic">
-    <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="5" />
   </path>
 
   <path name="bluetooth-sco-headset-microphones">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="Audio Capture Mic Source" value="BT_MIC" />
     <ctl name="Voice Call Mic Source" value="BT_MIC" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
@@ -1411,9 +1364,7 @@
   </path>
 
   <path name="usb-microphones">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
@@ -1428,6 +1379,54 @@
     <path name="usb-microphones" />
   </path>
 
+  <path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream0" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream0" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-0">
+    <path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream1" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream1" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-1">
+    <path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream2" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream2" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-2">
+    <path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
+  </path>
+
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->

audio/husky/audio-tables.mk

@@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \
     device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
 
 endif
+
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# Offload spatializer config
+PRODUCT_COPY_FILES += \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
+
+endif

audio/husky/config/audio_platform_configuration.xml

@@ -173,14 +173,14 @@
     </input_backend_cfg_mic_mapping>
 
     <usecase_attr>
-        <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 32 periods * 64 frames(around 1.3ms) * 2ch * 4(s32) = 16384 bytes -->
+	    <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 40 periods * 48 frames/period * 2ch * 4(s32) = 15360 bytes -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="true" period="64" period_num="32"/>
+        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="false" period="48" period_num="40"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->

audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>

audio/ripcurrent/config/audio_platform_configuration.xml

@@ -179,8 +179,8 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->

audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>

audio/shiba/aidl_config/audio_platform_configuration.xml

@@ -24,10 +24,13 @@
       <argument name="PollWaitMs" value="20000" />
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
       <argument name="ThermistorType" value="UNKNOWN" />
-      <argument name="ThrottlingSeverity" value="MODERATE" />
+      <argument name="ThrottlingSeverity" value="LIGHT" />
     </feature>
     <feature name="RuntimeTuningDump" />
-    <!-- <feature name="spatializer-offload" /> -->
+    <feature name="SoundDose">
+      <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
+    </feature>
+    <feature name="spatializer-offload" />
   </features>
 
   <voipVolume>
@@ -47,7 +50,6 @@
     <device name="usb" />
     <device name="speaker" codec="cs35l41">
       <argument name="SpeakerNum" value="2" />
-      <argument name="Rotation" />
       <argument name="AcousticShockProtection" />
     </device>
   </devices>
@@ -58,11 +60,12 @@
       <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
     </tuner>
     <tuner type="telephony" name="fortemedia">
-      <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
+      <argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
       <argument name="VoIP_Rate" value="32000" />
       <argument name="BOOST_USB_SWB_CLK" value="y" />
       <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
       <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
+      <argument name="MCPS_TABLE" value="y" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
   </tuners>
@@ -71,8 +74,8 @@
     <latency source="primary-playback" sink="speaker" milliseconds="20" />
     <latency source="primary-playback" sink="usb-device" milliseconds="10" />
     <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
 
     <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
     <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -89,18 +92,18 @@
     <latency source="microphones" sink="primary-capture" milliseconds="160" />
     <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
     <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
+    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
+    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
   </latencies>
 
   <spatialCapture>
     <enablement useCase="primary-capture" deviceInterface="microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
     <enablement useCase="primary-capture" deviceInterface="back-microphones">
       <source>MIC</source>
       <source>CAMCORDER</source>
-      <source>VOICE_RECOGNITION</source>
     </enablement>
   </spatialCapture>
 

audio/shiba/aidl_config/mixer_paths_aidl.xml

@@ -233,6 +233,7 @@
   <ctl name="EP6 TX Mixer INCALL_TX" value="0" />
   <ctl name="NoHost1 TX Mixer INCALL_TX" value="0" />
 
+  <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="0"/>
   <ctl name="EP4 TX Mixer I2S_2_TX" value="0" />
 
   <!-- AoC Mic setting -->
@@ -256,10 +257,14 @@
 
   <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" />
   <ctl name="Hotword Tap Enable" value="0" />
 
+  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
+  <!-- crashing since speicifc order is needed between dsp mode and"        -->
+  <!-- spatial module."                                                     -->
+  <ctl name="Mic Spatial Module Enable" value="0" />
+
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@@ -307,6 +312,7 @@
   <ctl name="Incall Capture Stream0" value="Off" />
   <ctl name="Incall Capture Stream1" value="Off" />
   <ctl name="Incall Capture Stream2" value="Off" />
+  <ctl name="Incall Capture Stream3" value="Off" />
 
   <!-- These two controls control the muting function of mics and sinks during the voice call. -->
   <!-- They would be enabled by HAL. -->
@@ -413,6 +419,10 @@
     <path name="primary-playback -> bt" />
   </path>
 
+  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -485,6 +495,10 @@
     <path name="raw-playback -> bt" />
   </path>
 
+  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -557,6 +571,10 @@
     <path name="deep-buffer-playback -> bt" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -634,6 +652,10 @@
     <path name="compress-offload-playback -> bt" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -706,6 +728,10 @@
     <path name="mmap-playback -> bt" />
   </path>
 
+  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -790,6 +816,10 @@
     <path name="voip-playback -> bt" />
   </path>
 
+  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -806,61 +836,6 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
-  <path name="immersive-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker-earpiece">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback-0 -> speaker-safe">
-    <path name="immersive-playback -> speaker" />
-  </path>
-
-  <path name="immersive-playback -> bt">
-    <ctl name="BT_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> bt">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-low-energy-headset">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
-    <path name="immersive-playback -> bt" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb">
-    <ctl name="USB_RX Mixer IMSV" value="1" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb-headset">
-    <path name="immersive-playback-0 -> usb" />
-  </path>
-
-  <path name="immersive-playback-0 -> usb-device">
-    <path name="immersive-playback-0 -> usb" />
-  </path>
 
   <path name="spatializer-offload-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP4" value="1" />
@@ -882,6 +857,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>
@@ -902,6 +889,10 @@
     <path name="spatializer-offload-playback -> bt" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP4" value="1" />
   </path>
@@ -972,6 +963,10 @@
     <path name="haptic-playback -> bt" />
   </path>
 
+  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1046,6 +1041,39 @@
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
+  <path name="microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-gsenet-capture-0">
+    <path name="usb-microphones -> voip-gsenet-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
+    <ctl name="Incall Capture Stream3" value="3MIC" />
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -1074,11 +1102,47 @@
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="microphones -> sound-trigger-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
 
-  <path name="microphones -> sound-trigger-tap-capture-0" />
+  <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="Hotword Tap Enable" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
 
-  <path name="microphones -> hotword-lookback-capture-0" />
+  <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
+
+  <path name="ultrasound-microphones -> ultrasound-capture-0">
+    <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
+  </path>
+
+  <path name="microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="back-microphones -> mmap-capture-0">
+    <path name="microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
 
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
@@ -1113,6 +1177,10 @@
     <path name="voice-call-downlink-0 -> bt" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
@@ -1165,77 +1233,9 @@
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
   </path>
 
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
+  <path name="in-call-capture-source-0 -> in-call-capture-0" />
-    <ctl name="Incall Capture Stream0" value="DL" />
+  <path name="in-call-capture-source-1 -> in-call-capture-1" />
-  </path>
+  <path name="in-call-capture-source-2 -> in-call-capture-2" />
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx (MIC) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="usb-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="usb-headset-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="usb-device-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
 
   <!-- codec setting -->
   <!-- Rx device -->
@@ -1249,7 +1249,6 @@
     <ctl name="PCM Source" value="ASP" />
     <ctl name="AMP PCM Gain" value="7" />
     <ctl name="Main AMP Enable Switch" value="1" />
-    <ctl name="AoC Chirp Enable" value="1" />
   </path>
 
   <path name="speaker">
@@ -1266,7 +1265,6 @@
     <ctl name="R ASPTX1 Slot Position" value="0" />
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
-    <!-- load Enable FIR -->
     <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
@@ -1275,36 +1273,35 @@
 
   <path name="speaker-safe">
     <ctl name="R Main AMP Enable Switch" value="1" />
-    <!-- load Bypass FIR -->
-    <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
   </path>
 
   <!-- Tx device -->
-  <path name="microphones">
+  <path name="builtin-mic-id-capture-list">
     <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="1" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+  </path>
+
+  <path name="microphones">
+    <path name="builtin-mic-id-capture-list" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
   <path name="microphones (VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="builtin-mic-id-capture-list" />
-    <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 HW Gain At High Power Mode (cB)" value="130" />
     <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)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="22" />
   </path>
@@ -1316,91 +1313,47 @@
   </path>
 
   <path name="microphones (SOUND_TRIGGER_AEC)">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="Audio Capture Eraser Enable" value="1" />
     <ctl name="Audio Capture Mic Source" value="ERASER" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="back-microphones">
+  <path name="microphones (CAMCORDER)">
-    <ctl name="Mic Spatial Module Enable" value="1" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="22" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
+  <path name="microphones (UNPROCESSED)">
+    <path name="builtin-mic-id-capture-list" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="5" />
+  </path>
+
+  <path name="back-microphones">
+    <path name="microphones" />
   </path>
 
   <path name="back-microphones (VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="microphones (VOICE)" />
-    <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 HW Gain At High Power Mode (cB)" value="130" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="microphones (CAMCORDER)">
+  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="back-microphones (VOICE)" />
-    <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">
+  <path name="back-microphones (UNPROCESSED)">
-    <ctl name="Mic Spatial Module Enable" value="1" />
+    <path name="microphones (UNPROCESSED)" />
-    <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="unprocessed-mic">
-    <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="5" />
-  </path>
-
-  <path name="unprocessed-dual-mic">
-    <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="5" />
-  </path>
-
-  <path name="unprocessed-triple-mic">
-    <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="5" />
   </path>
 
   <path name="bluetooth-sco-headset-microphones">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="Audio Capture Mic Source" value="BT_MIC" />
     <ctl name="Voice Call Mic Source" value="BT_MIC" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
@@ -1411,9 +1364,7 @@
   </path>
 
   <path name="usb-microphones">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <path name="builtin-mic-id-capture-list" />
-    <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="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
@@ -1428,6 +1379,54 @@
     <path name="usb-microphones" />
   </path>
 
+  <path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream0" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream0" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-0">
+    <path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream1" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream1" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-1">
+    <path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream2" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream2" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-2">
+    <path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
+  </path>
+
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->

audio/shiba/audio-tables.mk

@@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \
     device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
 
 endif
+
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# Offload spatializer config
+PRODUCT_COPY_FILES += \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
+    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
+
+endif

audio/shiba/config/audio_platform_configuration.xml

@@ -173,14 +173,14 @@
     </input_backend_cfg_mic_mapping>
 
     <usecase_attr>
-        <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 32 periods * 64 frames(around 1.3ms) * 2ch * 4(s32) = 16384 bytes -->
+	    <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 40 periods * 48 frames/period * 2ch * 4(s32) = 15360 bytes -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="true" period="64" period_num="32"/>
+        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="false" period="48" period_num="40"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->

audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>

avf/Android.bp

@@ -1,22 +0,0 @@
-//
-// Copyright (C) 2023 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.
-
-prebuilt_etc {
-    name: "shusky_assignable_devices.xml",
-    src: "assignable_devices.xml",
-    filename: "assignable_devices.xml",
-    vendor: true,
-    relative_install_path: "avf",
-}

avf/assignable_devices.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2023 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.
--->
-<devices>
-    <device>
-        <kind>eh</kind>
-        <dtbo_label>eh</dtbo_label>
-        <sysfs_path>/sys/bus/platform/devices/16d00000.eh</sysfs_path>
-    </device>
-</devices>

device-husky.mk

@@ -17,6 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
+ifdef RELEASE_GOOGLE_HUSKY_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
+endif
+ifdef RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)
+$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
+
+
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION)
 # Keeps flexibility for kasan and ufs builds
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR)
@@ -61,10 +72,9 @@ endif
 include device/google/shusky/camera/camera.mk
 include device/google/shusky/audio/husky/audio-tables.mk
 include device/google/zuma/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/stm/stm20.mk
+include device/google/gs-common/touch/stm/predump_stm20.mk
-include device/google/gs-common/touch/gti/gti.mk
+include device/google/gs-common/touch/gti/predump_gti.mk
 include device/google/gs-common/touch/touchinspector/touchinspector.mk
 
 # Init files
@@ -131,19 +141,27 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.finder.supported=true
 
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# AIDL
+
+else
+# HIDL
+
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio
 
-# declare use of spatial audio
-PRODUCT_PROPERTY_OVERRIDES += \
-       ro.audio.spatializer_enabled=true
-
 # Sound Dose
 PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
 	audio_sounddose_aoc
 
+endif
+
+# declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.spatializer_enabled=true
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
@@ -484,9 +502,6 @@ PRODUCT_PRODUCT_PROPERTIES ?= \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# AVF assignable devices xml
-PRODUCT_PACKAGES += shusky_assignable_devices.xml
-
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
@@ -508,11 +523,15 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
 endif
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+
+ifneq ($(wildcard vendor/arm/mali/valhall),)
 PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
+endif
 
 # Bluetooth device id
+# Husky: 0x410D
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20493
+    bluetooth.device_id.product_id=16653
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \

device-ripcurrent.mk

@@ -17,6 +17,11 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
+RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)
+$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
+
+
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION)
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers
@@ -40,7 +45,6 @@ CAMERA_PRODUCT ?= ripcurrent
 include device/google/shusky/audio/ripcurrent/audio-tables.mk
 include device/google/shusky/camera/camera.mk
 include device/google/zuma/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
 include device/google/gs-common/touch/stm/stm20.mk

device-shiba.mk

@@ -17,6 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
+ifdef RELEASE_GOOGLE_SHIBA_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
+endif
+ifdef RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
+$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
+
+
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION)
 # Keeps flexibility for kasan and ufs builds
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR)
@@ -45,9 +56,8 @@ endif
 include device/google/shusky/camera/camera.mk
 include device/google/shusky/audio/shiba/audio-tables.mk
 include device/google/zuma/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/gti/gti.mk
+include device/google/gs-common/touch/gti/predump_gti.mk
 
 # Init files
 PRODUCT_COPY_FILES += \
@@ -119,19 +129,27 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.finder.supported=true
 
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+# AIDL
+
+else
+# HIDL
+
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio
 
-# declare use of spatial audio
-PRODUCT_PROPERTY_OVERRIDES += \
-       ro.audio.spatializer_enabled=true
-
 # Sound Dose
 PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
 	audio_sounddose_aoc
 
+endif
+
+# declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.audio.spatializer_enabled=true
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
@@ -453,9 +471,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# AVF assignable devices xml
-PRODUCT_PACKAGES += shusky_assignable_devices.xml
-
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
@@ -477,11 +492,15 @@ $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modu
 endif
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+
+ifneq ($(wildcard vendor/arm/mali/valhall),)
 PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
+endif
 
 # Bluetooth device id
+# Shiba: 0x410E
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20492
+    bluetooth.device_id.product_id=16654
 
 # Set support for LEA multicodec
 PRODUCT_PRODUCT_PROPERTIES += \

husky/BoardConfig.mk

@@ -26,14 +26,8 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := husky
 
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
-RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
-RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)
-$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
-
 ifdef PHONE_CAR_BOARD_PRODUCT
-    include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+    include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
 else
     TARGET_SCREEN_DENSITY := 480
 endif
@@ -51,6 +45,7 @@ include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk
 include device/google/shusky-sepolicy/husky-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk

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

@@ -32,6 +32,15 @@
     <!-- Minimum screen brightness allowed by the power manager. -->
     <integer name="config_screenBrightnessDim">6</integer>
 
+    <!-- Default strength, in percentage, of bright color reduction when activated. -->
+    <integer name="config_reduceBrightColorsStrengthDefault">35</integer>
+
+    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
+
+    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMax">50</integer>
+
     <!-- If this is true, the udfps vote is ignored. -->
     <bool name="config_ignoreUdfpsVote">true</bool>
 

husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml

@@ -188,11 +188,11 @@
     </array>
     <item name="gps.voltage">3700</item>
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">57</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">550</item>
     <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3700</item>
+    <item name="wifi.controller.voltage">3850</item>
 </device>

location/gps.6.1.xml.hk3

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -101,6 +102,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps.6.1.xml.sb3

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -101,6 +102,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps.xml

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"

location/gps.xml.hk3

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -63,11 +64,13 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
        MaxThreadNum="13"
        SensorsMask="0x244"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
@@ -99,8 +102,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps.xml.sb3

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -63,11 +64,13 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
        MaxThreadNum="13"
        SensorsMask="0x244"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
@@ -99,8 +102,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps_user.6.1.xml.hk3

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -99,6 +100,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps_user.6.1.xml.sb3

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -99,6 +100,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps_user.xml

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -97,6 +98,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps_user.xml.hk3

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -61,11 +62,13 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
        MaxThreadNum="13"
        SensorsMask="0x244"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
@@ -97,8 +100,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps_user.xml.sb3

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="2"
        CpLppGuardTimeSec="2"
        IgnoreInjectedSystemTime="true"
@@ -61,11 +62,13 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="3600"
        RuntimeSwLteFilterEnable="true"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
        MaxThreadNum="13"
        SensorsMask="0x244"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
@@ -97,8 +100,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

manifest.xml

@@ -48,15 +48,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>

perf/powerhint-husky.json

@@ -81,8 +81,8 @@
       "Values": [
         "9999999",
         "1098000",
-        "1475000",
+        "1425000",
-        "975000",
+        "955000",
         "1197000",
         "1328000",
         "1548000",
@@ -96,7 +96,7 @@
       "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "1475000",
+        "1548000",
         "1197000",
         "0"
       ],
@@ -118,16 +118,13 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
-        "2253000",
+        "2245000",
         "2130000",
-        "1082000",
-        "1221000",
-        "1418000",
         "910000",
         "1328000",
-        "1622000",
+        "1572000",
         "1836000",
-        "1999000"
+        "1945000"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -137,10 +134,9 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "2253000",
+        "2245000",
         "2130000",
         "1836000",
-        "1221000",
         "0"
       ],
       "ResetOnInit": true
@@ -162,17 +158,13 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
-        "2704000",
+        "2687000",
-        "2507000",
+        "2147000",
-        "2252000",
+        "1298000",
-        "893000",
-        "1328000",
-        "1852000",
-        "1164000",
         "1557000",
         "1745000",
         "2049000",
-        "2409000"
+        "2363000"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -182,11 +174,10 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "2704000",
+        "2687000",
-        "2507000",
+        "2363000",
-        "2252000",
+        "2147000",
-        "1852000",
+        "1885000",
-        "1164000",
         "0"
       ],
       "ResetOnInit": true
@@ -228,7 +219,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -287,7 +277,7 @@
       "Path": "/proc/vendor_sched/cpu_skip_mask",
       "Values": [
         "0x0",
-        "0x80"
+        "0x100"
       ],
       "ResetOnInit": true
     },
@@ -315,7 +305,7 @@
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
       "Values": [
-        "765",
+        "720",
         "250",
         "0"
       ],
@@ -436,7 +426,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -466,6 +455,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x100"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -473,7 +471,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -737,7 +734,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
       "Values": [
         "2363000",
-        "1852000",
+        "1745000",
         "1298000"
       ],
       "DefaultIndex": 0
@@ -1341,7 +1338,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 1000,
-      "Value": "1852000"
+      "Value": "1885000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1365,13 +1362,13 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPULittleClusterMinFreq",
       "Duration": 1000,
-      "Value": "1475000"
+      "Value": "1548000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CAMUClampBoost",
       "Duration": 1000,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1455,19 +1452,19 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1485,7 +1482,7 @@
       "PowerHint": "CAMERA_SHOT",
       "Node": "CAMUClampBoost",
       "Duration": 100,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",
@@ -1539,13 +1536,13 @@
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "2704000"
+      "Value": "2687000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 3000,
-      "Value": "2704000"
+      "Value": "2687000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
@@ -1557,13 +1554,13 @@
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "2507000"
+      "Value": "2363000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK2",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 3000,
-      "Value": "2507000"
+      "Value": "2363000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
@@ -1575,13 +1572,13 @@
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "2252000"
+      "Value": "2147000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK3",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 3000,
-      "Value": "2252000"
+      "Value": "2147000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK1",
@@ -1599,13 +1596,13 @@
       "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3000,
-      "Value": "2253000"
+      "Value": "2245000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK2",
       "Node": "CPUMidClusterMinFreq",
       "Duration": 3000,
-      "Value": "2253000"
+      "Value": "2245000"
     },
     {
       "PowerHint": "GCA_CAMERA_SHOT_MIDCPU_RANK3",
@@ -2253,19 +2250,19 @@
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
@@ -2525,7 +2522,7 @@
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "975000"
+      "Value": "955000"
     },
     {
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60",
@@ -2567,7 +2564,7 @@
       "PowerHint": "LOW_POWER_MID_CLUSTER_70",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "LOW_POWER_MID_CLUSTER_80",
@@ -2579,13 +2576,13 @@
       "PowerHint": "LOW_POWER_MID_CLUSTER_90",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1999000"
+      "Value": "1945000"
     },
     {
       "PowerHint": "LOW_POWER_CPU_50",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1328000"
+      "Value": "1298000"
     },
     {
       "PowerHint": "LOW_POWER_CPU_60",
@@ -2609,7 +2606,7 @@
       "PowerHint": "LOW_POWER_CPU_90",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "2409000"
+      "Value": "2363000"
     },
     {
       "PowerHint": "LOW_POWER",
@@ -2890,7 +2887,7 @@
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 500,
-      "Value": "1852000"
+      "Value": "1885000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
@@ -2992,7 +2989,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_LIMIT_FREQ",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3040,19 +3037,19 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",

perf/powerhint-ripcurrent.json

@@ -214,7 +214,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -273,7 +272,7 @@
       "Path": "/proc/vendor_sched/cpu_skip_mask",
       "Values": [
         "0x0",
-        "0x80"
+        "0x100"
       ],
       "ResetOnInit": true
     },
@@ -301,7 +300,7 @@
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
       "Values": [
-        "765",
+        "720",
         "250",
         "0"
       ],
@@ -422,7 +421,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -452,6 +450,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x100"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -459,7 +466,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -1347,7 +1353,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CAMUClampBoost",
       "Duration": 1000,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1443,7 +1449,7 @@
       "PowerHint": "CAMERA_SHOT",
       "Node": "CAMUClampBoost",
       "Duration": 100,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",

perf/powerhint-shiba.json

@@ -81,8 +81,8 @@
       "Values": [
         "9999999",
         "1098000",
-        "1475000",
+        "1425000",
-        "975000",
+        "955000",
         "1197000",
         "1328000",
         "1548000",
@@ -96,7 +96,7 @@
       "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "1475000",
+        "1548000",
         "1197000",
         "0"
       ],
@@ -118,14 +118,11 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
-        "1082000",
-        "1221000",
-        "1418000",
         "910000",
         "1328000",
-        "1622000",
+        "1572000",
         "1836000",
-        "1999000"
+        "1945000"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -136,7 +133,6 @@
       "Values": [
         "9999999",
         "1836000",
-        "1221000",
         "0"
       ],
       "ResetOnInit": true
@@ -158,14 +154,11 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
       "Values": [
         "9999999",
-        "893000",
+        "1298000",
-        "1328000",
-        "1852000",
-        "1164000",
         "1557000",
         "1745000",
         "2049000",
-        "2409000"
+        "2363000"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -175,8 +168,7 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
-        "1852000",
+        "1885000",
-        "1164000",
         "0"
       ],
       "ResetOnInit": true
@@ -218,7 +210,6 @@
         "0",
         "1"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -287,7 +278,7 @@
       "Path": "/proc/vendor_sched/cpu_skip_mask",
       "Values": [
         "0x0",
-        "0x80"
+        "0x100"
       ],
       "ResetOnInit": true
     },
@@ -315,7 +306,7 @@
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
       "Values": [
-        "765",
+        "720",
         "250",
         "0"
       ],
@@ -436,7 +427,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -466,6 +456,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "SysGroupCfsSkipMask",
+      "Path": "/proc/vendor_sched/groups/sys/group_cfs_skip_mask",
+      "Values": [
+        "0x0",
+        "0x100"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGPreferIdle",
       "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -473,7 +472,6 @@
         "1",
         "0"
       ],
-      "DefaultIndex": 0,
       "ResetOnInit": true
     },
     {
@@ -737,7 +735,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
       "Values": [
         "2363000",
-        "1852000",
+        "1745000",
         "1298000"
       ],
       "DefaultIndex": 0
@@ -1347,7 +1345,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 1000,
-      "Value": "1852000"
+      "Value": "1885000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1371,13 +1369,13 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPULittleClusterMinFreq",
       "Duration": 1000,
-      "Value": "1475000"
+      "Value": "1548000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CAMUClampBoost",
       "Duration": 1000,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -1461,19 +1459,19 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 3000,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
@@ -1491,7 +1489,7 @@
       "PowerHint": "CAMERA_SHOT",
       "Node": "CAMUClampBoost",
       "Duration": 100,
-      "Value": "765"
+      "Value": "720"
     },
     {
       "PowerHint": "CAMERA_BACKEND_BOOST",
@@ -2151,19 +2149,19 @@
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
@@ -2429,7 +2427,7 @@
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "975000"
+      "Value": "955000"
     },
     {
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60",
@@ -2471,7 +2469,7 @@
       "PowerHint": "LOW_POWER_MID_CLUSTER_70",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "LOW_POWER_MID_CLUSTER_80",
@@ -2483,13 +2481,13 @@
       "PowerHint": "LOW_POWER_MID_CLUSTER_90",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1999000"
+      "Value": "1945000"
     },
     {
       "PowerHint": "LOW_POWER_CPU_50",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "1328000"
+      "Value": "1298000"
     },
     {
       "PowerHint": "LOW_POWER_CPU_60",
@@ -2513,7 +2511,7 @@
       "PowerHint": "LOW_POWER_CPU_90",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 3600000,
-      "Value": "2409000"
+      "Value": "2363000"
     },
     {
       "PowerHint": "LOW_POWER",
@@ -2794,7 +2792,7 @@
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 500,
-      "Value": "1852000"
+      "Value": "1885000"
     },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
@@ -2896,7 +2894,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_BIG_LIMIT_FREQ",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -2944,19 +2942,19 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "1852000"
+      "Value": "1745000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "1622000"
+      "Value": "1572000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "1475000"
+      "Value": "1425000"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",

ripcurrent/BoardConfig.mk

@@ -27,13 +27,10 @@ TARGET_SCREEN_DENSITY := 440
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_SHUSKY := true
 
-RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)
-$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
-
 include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/shusky-sepolicy/ripcurrent-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk

shiba/BoardConfig.mk

@@ -26,12 +26,6 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := shiba
 
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
-RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
-RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
-$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
-
 ifdef PHONE_CAR_BOARD_PRODUCT
     include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
 else
@@ -47,6 +41,7 @@ include device/google/shusky/device-shusky-common.mk
 
 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk
 include device/google/shusky-sepolicy/shiba-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk

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

@@ -32,6 +32,15 @@
     <!-- Minimum screen brightness allowed by the power manager. -->
     <integer name="config_screenBrightnessDim">6</integer>
 
+    <!-- Default strength, in percentage, of bright color reduction when activated. -->
+    <integer name="config_reduceBrightColorsStrengthDefault">35</integer>
+
+    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
+
+    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMax">50</integer>
+
     <!-- Minimum screen brightness setting allowed by power manager.
          The user is forbidden from setting the brightness below this level.  -->
     <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>

shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml

@@ -188,11 +188,11 @@
     </array>
     <item name="gps.voltage">3700</item>
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">57</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">550</item>
     <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3700</item>
+    <item name="wifi.controller.voltage">3850</item>
 </device>

thermal/thermal_info_config_charge_husky.json

@@ -5,7 +5,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 32.1, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -15,7 +14,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 33.7, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,7 +23,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 47.2, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -35,7 +32,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 48.4, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.7, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -61,7 +56,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -71,7 +65,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 34.6, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -80,7 +73,6 @@
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000

thermal/thermal_info_config_charge_shiba.json

@@ -5,7 +5,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 38.8, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -15,7 +14,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,7 +23,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 41.4, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -35,7 +32,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 42.4, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.2, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -61,7 +56,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 41.5, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -71,7 +65,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 35.1, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -80,7 +73,6 @@
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000

thermal/thermal_info_config_husky.json

@@ -5,7 +5,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 32.1, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -15,7 +14,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 33.7, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,7 +23,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 47.2, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -35,7 +32,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 48.4, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.7, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -61,7 +56,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -71,7 +65,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 34.6, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -80,7 +73,6 @@
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000

thermal/thermal_info_config_shiba.json

@@ -5,7 +5,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 38.8, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -15,7 +14,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,7 +23,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 41.4, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -35,7 +32,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 42.4, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.2, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -61,7 +56,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 41.5, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -71,7 +65,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 35.1, "NaN", "NaN", "NaN", "NaN", "NaN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -80,7 +73,6 @@
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000