Merge UP1A.230905.019
Merged-In: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1
Change-Id: Iaf0487e1418188518ead01202f04e643c45cc2b3
diff --git a/device-oriole.mk b/device-oriole.mk
index d230c70..d84bd18 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -182,7 +182,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=61
+ ro.vendor.build.svn=65
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 97d6638..ca8b29e 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -194,7 +194,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=61
+ ro.vendor.build.svn=65
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index 8514ffa..569b0a9 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -9,7 +9,7 @@
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
@@ -17,7 +17,7 @@
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
@@ -36,7 +36,7 @@
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
diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf
index 7f02b49..0e5b153 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -9,7 +9,7 @@
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
@@ -17,7 +17,7 @@
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
@@ -36,7 +36,7 @@
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
diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf
index 7f02b49..0e5b153 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -9,7 +9,7 @@
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
@@ -17,7 +17,7 @@
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
@@ -36,7 +36,7 @@
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
diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf
index 6eba206..550519d 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -9,7 +9,7 @@
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
@@ -17,7 +17,7 @@
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
@@ -36,7 +36,7 @@
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
diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf
index f492db3..46aba9a 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -9,7 +9,7 @@
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
@@ -17,7 +17,7 @@
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
@@ -36,7 +36,7 @@
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
diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf
index c709cec..a5e88b1 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -9,7 +9,7 @@
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
@@ -17,7 +17,7 @@
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
@@ -36,7 +36,7 @@
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
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index 5972577..b4047cd 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -9,7 +9,7 @@
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
@@ -17,7 +17,7 @@
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
@@ -36,7 +36,7 @@
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