From 3c14c464dde7bc57b7abe28da9a81d04934f32ba Mon Sep 17 00:00:00 2001
From: Kenzi Mudge <kenzimatic@google.com>
Date: Wed, 17 May 2023 15:46:14 -0400
Subject: [PATCH 1/3] Enable UWB filtering on all devices

These values are the same as today's defaults, but explicitly assert
hardware-specific needs.

Bug: b/237098661
Test: Manual confirmation
Change-Id: Ifc4a877bf2d608a00ae4a9153a99ace58e9618fd
---
 rro_overlays/UwbOverlay/res/values/config.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rro_overlays/UwbOverlay/res/values/config.xml b/rro_overlays/UwbOverlay/res/values/config.xml
index 7a77d32..3c45c6a 100644
--- a/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/rro_overlays/UwbOverlay/res/values/config.xml
@@ -17,4 +17,10 @@
  */
 -->
 <resources>
+    <!-- When true, the filter engine will alter UWB values to improve accuracy. -->
+    <bool name="enable_filters">true</bool>
+
+    <!-- Enables the AoA conversion primer. This is needed on hardware that does not convert AoA
+    to spherical coordinates, including hardware that does not support elevation.-->
+    <bool name="enable_primer_aoa">true</bool>
 </resources>

From 8677d6f35a945af4701d1da87674090a1b3f64df Mon Sep 17 00:00:00 2001
From: Dylan Tian <tiand@google.com>
Date: Thu, 18 May 2023 09:17:23 +0000
Subject: [PATCH 2/3] Update F10 BT SAR table for hotspot mode scenarios

Bug: 283180745
Test: Manually check
Change-Id: I59adaa744f6095afa9ff0deed1b6ab6fb3aa4cae
---
 bluetooth/bluetooth_power_limits_felix.csv    | 8 ++++++--
 bluetooth/bluetooth_power_limits_felix_EU.csv | 8 ++++++--
 bluetooth/bluetooth_power_limits_felix_JP.csv | 8 ++++++--
 bluetooth/bluetooth_power_limits_felix_US.csv | 8 ++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/bluetooth/bluetooth_power_limits_felix.csv b/bluetooth/bluetooth_power_limits_felix.csv
index a80d5ba..785733a 100644
--- a/bluetooth/bluetooth_power_limits_felix.csv
+++ b/bluetooth/bluetooth_power_limits_felix.csv
@@ -31,7 +31,9 @@ off,on,on,on,off,off,any,60,60,30,66,66,30,54,54,18,54,54,18
 off,on,on,on,off,on,any,60,60,30,66,66,30,54,54,18,54,54,18
 off,on,on,on,on,off,any,60,60,30,66,66,30,54,54,18,54,54,18
 off,on,on,on,on,on,any,60,60,30,66,66,30,54,54,18,54,54,18
-off,off,any,any,any,any,off,66,66,30,66,66,30,54,54,18,54,54,18
+off,off,off,any,off,any,off,66,66,30,66,66,30,54,54,18,54,54,18
+off,off,on,any,off,any,off,56,56,30,66,66,30,54,54,18,54,54,18
+off,off,off,any,on,any,off,56,56,30,66,66,30,54,54,18,54,54,18
 on,off,off,off,off,off,on,66,66,30,66,66,30,54,54,18,54,54,18
 on,off,off,off,off,on,on,50,50,30,54,54,30,48,48,18,48,48,18
 on,off,off,off,on,off,on,50,50,30,54,54,30,48,48,18,48,48,18
@@ -64,4 +66,6 @@ on,on,on,on,off,off,any,28,28,30,48,48,30,28,28,18,48,48,18
 on,on,on,on,off,on,any,28,28,30,48,48,30,28,28,18,48,48,18
 on,on,on,on,on,off,any,28,28,30,48,48,30,28,28,18,48,48,18
 on,on,on,on,on,on,any,28,28,30,48,48,30,28,28,18,48,48,18
-on,off,any,any,any,any,off,66,66,30,66,66,30,54,54,18,54,54,18
+on,off,off,any,off,any,off,66,66,30,66,66,30,54,54,18,54,54,18
+on,off,on,any,off,any,off,50,50,30,54,54,30,48,48,18,48,48,18
+on,off,off,any,on,any,off,50,50,30,54,54,30,48,48,18,48,48,18
diff --git a/bluetooth/bluetooth_power_limits_felix_EU.csv b/bluetooth/bluetooth_power_limits_felix_EU.csv
index 862319c..af47d49 100644
--- a/bluetooth/bluetooth_power_limits_felix_EU.csv
+++ b/bluetooth/bluetooth_power_limits_felix_EU.csv
@@ -31,7 +31,9 @@ off,on,on,on,off,off,any,68,66,30,74,66,30,64,54,18,64,54,18
 off,on,on,on,off,on,any,68,66,30,74,66,30,64,54,18,64,54,18
 off,on,on,on,on,off,any,68,66,30,74,66,30,64,54,18,64,54,18
 off,on,on,on,on,on,any,68,66,30,74,66,30,64,54,18,64,54,18
-off,off,any,any,any,any,off,76,66,30,76,66,30,64,54,18,64,54,18
+off,off,off,any,off,any,off,76,66,30,76,66,30,64,54,18,64,54,18
+off,off,on,any,off,any,off,68,66,30,74,66,30,64,54,18,64,54,18
+off,off,off,any,on,any,off,68,66,30,74,66,30,64,54,18,64,54,18
 on,off,off,off,off,off,on,76,66,30,76,66,30,64,54,18,64,54,18
 on,off,off,off,off,on,on,74,66,30,76,66,30,64,54,18,64,54,18
 on,off,off,off,on,off,on,74,66,30,76,66,30,64,54,18,64,54,18
@@ -64,4 +66,6 @@ on,on,on,on,off,off,any,68,66,30,74,66,30,64,54,18,64,54,18
 on,on,on,on,off,on,any,68,66,30,74,66,30,64,54,18,64,54,18
 on,on,on,on,on,off,any,68,66,30,74,66,30,64,54,18,64,54,18
 on,on,on,on,on,on,any,68,66,30,74,66,30,64,54,18,64,54,18
-on,off,any,any,any,any,off,76,66,30,76,66,30,64,54,18,64,54,18
+on,off,off,any,off,any,off,76,66,30,76,66,30,64,54,18,64,54,18
+on,off,on,any,off,any,off,74,66,30,76,66,30,64,54,18,64,54,18
+on,off,off,any,on,any,off,74,66,30,76,66,30,64,54,18,64,54,18
diff --git a/bluetooth/bluetooth_power_limits_felix_JP.csv b/bluetooth/bluetooth_power_limits_felix_JP.csv
index e09b044..28b52c5 100644
--- a/bluetooth/bluetooth_power_limits_felix_JP.csv
+++ b/bluetooth/bluetooth_power_limits_felix_JP.csv
@@ -31,7 +31,9 @@ off,on,on,on,off,off,any,66,66,34,66,66,34,54,54,22,54,54,22
 off,on,on,on,off,on,any,66,66,34,66,66,34,54,54,22,54,54,22
 off,on,on,on,on,off,any,66,66,34,66,66,34,54,54,22,54,54,22
 off,on,on,on,on,on,any,66,66,34,66,66,34,54,54,22,54,54,22
-off,off,any,any,any,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+off,off,off,any,off,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+off,off,on,any,off,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+off,off,off,any,on,any,off,66,66,34,66,66,34,54,54,22,54,54,22
 on,off,off,off,off,off,on,66,66,34,66,66,34,54,54,22,54,54,22
 on,off,off,off,off,on,on,66,66,34,66,66,34,54,54,22,54,54,22
 on,off,off,off,on,off,on,66,66,34,66,66,34,54,54,22,54,54,22
@@ -64,4 +66,6 @@ on,on,on,on,off,off,any,66,66,34,66,66,34,54,54,22,54,54,22
 on,on,on,on,off,on,any,66,66,34,66,66,34,54,54,22,54,54,22
 on,on,on,on,on,off,any,66,66,34,66,66,34,54,54,22,54,54,22
 on,on,on,on,on,on,any,66,66,34,66,66,34,54,54,22,54,54,22
-on,off,any,any,any,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+on,off,off,any,off,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+on,off,on,any,off,any,off,66,66,34,66,66,34,54,54,22,54,54,22
+on,off,off,any,on,any,off,66,66,34,66,66,34,54,54,22,54,54,22
diff --git a/bluetooth/bluetooth_power_limits_felix_US.csv b/bluetooth/bluetooth_power_limits_felix_US.csv
index 970f816..6d515a0 100644
--- a/bluetooth/bluetooth_power_limits_felix_US.csv
+++ b/bluetooth/bluetooth_power_limits_felix_US.csv
@@ -31,7 +31,9 @@ off,on,on,on,off,off,any,60,60,60,78,66,78,58,54,58,66,54,66
 off,on,on,on,off,on,any,60,60,60,78,66,78,58,54,58,66,54,66
 off,on,on,on,on,off,any,60,60,60,78,66,78,58,54,58,66,54,66
 off,on,on,on,on,on,any,60,60,60,78,66,78,58,54,58,66,54,66
-off,off,any,any,any,any,off,78,66,78,78,66,78,66,54,66,66,54,66
+off,off,off,any,off,any,off,78,66,78,78,66,78,66,54,66,66,54,66
+off,off,on,any,off,any,off,56,56,56,66,66,66,56,54,56,66,54,66
+off,off,off,any,on,any,off,56,56,56,66,66,66,56,54,56,66,54,66
 on,off,off,off,off,off,on,78,66,78,78,66,78,66,54,66,66,54,66
 on,off,off,off,off,on,on,66,66,66,66,66,66,66,54,66,66,54,66
 on,off,off,off,on,off,on,66,66,66,66,66,66,66,54,66,66,54,66
@@ -64,4 +66,6 @@ on,on,on,on,off,off,any,28,28,28,48,48,48,28,28,28,48,48,48
 on,on,on,on,off,on,any,28,28,28,48,48,48,28,28,28,48,48,48
 on,on,on,on,on,off,any,28,28,28,48,48,48,28,28,28,48,48,48
 on,on,on,on,on,on,any,28,28,28,48,48,48,28,28,28,48,48,48
-on,off,any,any,any,any,off,78,66,78,78,66,78,66,54,66,66,54,66
+on,off,off,any,off,any,off,78,66,78,78,66,78,66,54,66,66,54,66
+on,off,on,any,off,any,off,50,50,50,54,54,54,48,48,48,48,48,48
+on,off,off,any,on,any,off,50,50,50,54,54,54,48,48,48,48,48,48

From d13f280f8026fbe699f607c7805bfc003a3e4402 Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Fri, 19 May 2023 10:34:46 +0800
Subject: [PATCH 3/3] Update Felix SVN to 8

Bug: 278035362
Change-Id: I49536497997e4c81caac6fc5eaec9de52b771863
---
 device-felix.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-felix.mk b/device-felix.mk
index d33c1f7..df22993 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -197,7 +197,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=7
+    ro.vendor.build.svn=8
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\