Snap for 10453563 from 246a083e09a2c273053337da3cd7e9422780d094 to mainline-tzdata5-release

Change-Id: I62aa906ed420d0a968a35cc4f2ec66f3db556388

24 files changed, 223 insertions, 117 deletions

diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index 908b6cd9..a09cbaec 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -66,11 +66,3 @@ on property:persist.vendor.se.ese2.mode=ctsmode
 on property:sys.retaildemo.enabled=1
     setprop persist.vendor.charge.stop.level 35
     setprop persist.vendor.charge.start.level 30
-
-# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints
-on property:sys.boot_completed=1
-    trigger override-sf-uclamp
-
-on override-sf-uclamp
-    write /proc/vendor_sched/rt_uclamp_min 0
-    write /proc/vendor_sched/sf_uclamp_min 0
diff --git a/device-oriole.mk b/device-oriole.mk
index e7d8fd7d..d8f40b28 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -182,7 +182,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=56
+    ro.vendor.build.svn=63
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -211,7 +211,8 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.gms.dck.eligible_wcc=2
+    ro.gms.dck.eligible_wcc=2 \
+    ro.gms.dck.se_capability=1
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
@@ -271,3 +272,7 @@ else
         PRODUCT_COPY_FILES += \
 		device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
+
+# Disable Settings large-screen optimization enabled by Window Extensions
+PRODUCT_SYSTEM_PROPERTIES += \
+    persist.settings.large_screen_opt.enabled=false
diff --git a/device-raven.mk b/device-raven.mk
index fffcbfcd..fd3e9ed5 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -194,7 +194,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=56
+    ro.vendor.build.svn=63
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -221,7 +221,8 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.gms.dck.eligible_wcc=3
+    ro.gms.dck.eligible_wcc=3 \
+    ro.gms.dck.se_capability=1
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \
@@ -290,3 +291,7 @@ else
         PRODUCT_COPY_FILES += \
 		device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
+
+# Disable Settings large-screen optimization enabled by Window Extensions
+PRODUCT_SYSTEM_PROPERTIES += \
+    persist.settings.large_screen_opt.enabled=false
diff --git a/device-slider.mk b/device-slider.mk
index 72f5a1df..5cbab35d 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -28,6 +28,7 @@ include device/google/gs101/device-common.mk
 include device/google/raviole/audio/slider/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device.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/stm11.mk
 
 # go/lyric-soong-variables
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 7c2a533e..0c366c81 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -28,6 +28,7 @@ include device/google/gs101/device-common.mk
 include hardware/google/pixel/vibrator/drv2624/device.mk
 include device/google/raviole/audio/whitefin/audio-tables.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/lsi/lsi.mk
 
 # wireless_charger HAL service needs to be included specially due to no raviole-sepolicy folder
diff --git a/location/gps.xml b/location/gps.xml
index 8fb7c66e..7c534152 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -35,6 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index d85fd169..cd149a7b 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -35,6 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index a095dbd1..3c6dbc6d 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -35,6 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 5efd5421..baf0ee5f 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -34,6 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole
index 2d503725..558799d7 100644
--- a/location/gps_user.xml.oriole
+++ b/location/gps_user.xml.oriole
@@ -34,6 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven
index b2fb2bd2..08618579 100644
--- a/location/gps_user.xml.raven
+++ b/location/gps_user.xml.raven
@@ -34,6 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 67405dd7..c280a88f 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -224,9 +224,6 @@
          non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
     <integer name="config_vibrationWaveformRampDownDuration">50</integer>
 
-    <!-- the number of the max cached processes in the system. -->
-    <integer name="config_customizedMaxCachedProcesses">64</integer>
-
 <integer-array name="config_ambientThresholdLevels">
     <item>2</item>
     <item>3</item>
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 9ec6a0e8..16a368f4 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -131,6 +131,16 @@
       "ResetOnInit": true
     },
     {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
+    {
       "Name": "TAUClampBoost",
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
@@ -477,6 +487,16 @@
         "0,1,2,3,4,5,6,7"
       ],
       "Type": "Property"
+    },
+    {
+      "Name": "Dex2oatGroup",
+      "Path": "/proc/vendor_sched/dex2oat_ug",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
     }
   ],
   "Actions": [
@@ -949,6 +969,12 @@
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
       "Value": "1491000"
@@ -1417,6 +1443,12 @@
       "Value": "0,1,2,3,4,5"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1483,6 +1515,12 @@
       "Value": "0,1,2,3"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1549,6 +1587,12 @@
       "Value": "0,1,2,3"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1615,6 +1659,12 @@
       "Value": "0,1,2,3"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1699,6 +1749,12 @@
       "Value": "0,1,2,3"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_LITTLE_TSKIN_BYPASS",
       "Duration": 1000,
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 46970f30..b0b22d89 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -130,6 +130,16 @@
       "ResetOnInit": true
     },
     {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
+    {
       "Name": "TAUClampBoost",
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
@@ -476,6 +486,16 @@
         "0,1,2,3,4,5,6,7"
       ],
       "Type": "Property"
+    },
+    {
+      "Name": "Dex2oatGroup",
+      "Path": "/proc/vendor_sched/dex2oat_ug",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
     }
   ],
   "Actions": [
@@ -948,6 +968,12 @@
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
       "Value": "1491000"
@@ -1398,6 +1424,12 @@
       "Value": "0,1,2,3,4,5"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1464,6 +1496,12 @@
       "Value": "0,1,2,3"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1530,6 +1568,12 @@
       "Value": "0,1,2,3"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1596,6 +1640,12 @@
       "Value": "0,1,2,3"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1680,6 +1730,12 @@
       "Value": "0,1,2,3"
     },
     {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
+      "Node": "Dex2oatGroup",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_LITTLE_TSKIN_BYPASS",
       "Duration": 1000,
diff --git a/powerhint-slider.json b/powerhint-slider.json
index 52c8cb36..bd5ab4c7 100644
--- a/powerhint-slider.json
+++ b/powerhint-slider.json
@@ -130,6 +130,16 @@
       "ResetOnInit": true
     },
     {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
+    {
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
@@ -840,6 +850,12 @@
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
       "Value": "1491000"
diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json
index fa470a94..cc335bc9 100644
--- a/powerhint-whitefin.json
+++ b/powerhint-whitefin.json
@@ -130,6 +130,16 @@
       "ResetOnInit": true
     },
     {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
+    {
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
@@ -831,6 +841,12 @@
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
       "Value": "1491000"
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 1a78f19c..c8d87304 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -200,9 +200,6 @@
     <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
     <bool name="config_faceAuthDismissesKeyguard">false</bool>
 
-    <!-- the number of the max cached processes in the system. -->
-    <integer name="config_customizedMaxCachedProcesses">64</integer>
-
 <integer-array name="config_ambientThresholdLevels">
     <item>2</item>
     <item>3</item>
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index 12b7f470..569b0a9a 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -1,22 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x4B4B234B
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.ant_delay=16437
 ant0.ch5.prf64.tx_power=0x4B4B234B
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
@@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426
 ant0.ch9.prf16.tx_power=0x53532B53
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x34
-ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.ant_delay=16440
 ant0.ch9.prf64.tx_power=0x53532B53
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x34
@@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429
 ant1.ch9.prf16.tx_power=0
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0
-ant1.ch9.prf64.ant_delay=16429
+ant1.ch9.prf64.ant_delay=16459
 ant1.ch9.prf64.tx_power=0
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
+[HAL]aoa_restricted_channels=0x20
 [HAL]aoa_capability=1
 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf
index 25b1bb1b..0e5b1535 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -1,22 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.ant_delay=16437
 ant0.ch5.prf64.tx_power=0x47472347
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
@@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426
 ant0.ch9.prf16.tx_power=0x47472347
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x34
-ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.ant_delay=16440
 ant0.ch9.prf64.tx_power=0x47472347
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x34
@@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429
 ant1.ch9.prf16.tx_power=0
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0
-ant1.ch9.prf64.ant_delay=16429
+ant1.ch9.prf64.ant_delay=16459
 ant1.ch9.prf64.tx_power=0
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
+[HAL]aoa_restricted_channels=0x20
 [HAL]aoa_capability=1
 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf
index 25b1bb1b..0e5b1535 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -1,22 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.ant_delay=16437
 ant0.ch5.prf64.tx_power=0x47472347
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
@@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426
 ant0.ch9.prf16.tx_power=0x47472347
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x34
-ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.ant_delay=16440
 ant0.ch9.prf64.tx_power=0x47472347
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x34
@@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429
 ant1.ch9.prf16.tx_power=0
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0
-ant1.ch9.prf64.ant_delay=16429
+ant1.ch9.prf64.ant_delay=16459
 ant1.ch9.prf64.tx_power=0
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
+[HAL]aoa_restricted_channels=0x20
 [HAL]aoa_capability=1
 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf
index 9dfc0695..550519d4 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -1,22 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x01
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0
-ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.ant_delay=16437
 ant0.ch5.prf64.tx_power=0
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0
@@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426
 ant0.ch9.prf16.tx_power=0x2A2A2A2A
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x20
-ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.ant_delay=16440
 ant0.ch9.prf64.tx_power=0x2A2A2A2A
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x20
@@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429
 ant1.ch9.prf16.tx_power=0
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0
-ant1.ch9.prf64.ant_delay=16429
+ant1.ch9.prf64.ant_delay=16459
 ant1.ch9.prf64.tx_power=0
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0
@@ -110,6 +103,7 @@ smart_tx_power=1
 auto_sleep_margin=20000
 alternate_pulse_shape=0x01
 restricted_channels=0x20
+[HAL]aoa_restricted_channels=0x20
 [HAL]aoa_capability=1
 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf
index 681a5f3d..46aba9ac 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -1,22 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.ant_delay=16437
 ant0.ch5.prf64.tx_power=0x47472347
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
@@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426
 ant0.ch9.prf16.tx_power=0x47472347
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x34
-ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.ant_delay=16440
 ant0.ch9.prf64.tx_power=0x47472347
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x34
@@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429
 ant1.ch9.prf16.tx_power=0
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0
-ant1.ch9.prf64.ant_delay=16429
+ant1.ch9.prf64.ant_delay=16459
 ant1.ch9.prf64.tx_power=0
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0xffff
+[HAL]aoa_restricted_channels=0x20
 [HAL]aoa_capability=1
 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf
index 7bd68dc5..a5e88b11 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -1,22 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.ant_delay=16437
 ant0.ch5.prf64.tx_power=0x47472347
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
@@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426
 ant0.ch9.prf16.tx_power=0x47472347
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x34
-ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.ant_delay=16440
 ant0.ch9.prf64.tx_power=0x47472347
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x34
@@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429
 ant1.ch9.prf16.tx_power=0
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0
-ant1.ch9.prf64.ant_delay=16429
+ant1.ch9.prf64.ant_delay=16459
 ant1.ch9.prf64.tx_power=0
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0x20
+[HAL]aoa_restricted_channels=0x20
 [HAL]aoa_capability=1
 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index 47d917ce..b4047cd7 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -1,22 +1,15 @@
-[CCC]version=2
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
+[CCC]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.ant_delay=16437
 ant0.ch5.prf64.tx_power=0x47472347
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
@@ -24,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426
 ant0.ch9.prf16.tx_power=0x2A2A2A2A
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x20
-ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.ant_delay=16440
 ant0.ch9.prf64.tx_power=0x2A2A2A2A
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x20
@@ -43,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429
 ant1.ch9.prf16.tx_power=0
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0
-ant1.ch9.prf64.ant_delay=16429
+ant1.ch9.prf64.ant_delay=16459
 ant1.ch9.prf64.tx_power=0
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
+[HAL]aoa_restricted_channels=0x20
 [HAL]aoa_capability=1
 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
@@ -139,4 +133,4 @@ coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500
 coex_interval_us=2000
-alternate_pulse_shape=0x01
+alternate_pulse_shape=0x00