From d13a2b44ba32be2844ca82826e79da6308ab9933 Mon Sep 17 00:00:00 2001
From: jonerlin <jonerlin@google.com>
Date: Thu, 27 Jul 2023 04:20:48 +0800
Subject: [PATCH 1/5] enable Bluetooth vendor btsnoop in userdebug build as
 default

Bug: 294816359
Test: enable Bluetooth and get bugreport
Change-Id: I50a0358654062c264cef6ccbdc89cb7995efb5a2
---
 device-husky.mk | 6 ++++--
 device-shiba.mk | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/device-husky.mk b/device-husky.mk
index dc8c034..99ecd1f 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -149,12 +149,14 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=29 \
-    persist.bluetooth.bqr.vnd_trace_mask=0
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
 else
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=16 \
-    persist.bluetooth.bqr.vnd_trace_mask=0
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
 endif
 
 # Spatial Audio
diff --git a/device-shiba.mk b/device-shiba.mk
index 01f2e82..fd87cb6 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -138,12 +138,14 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=29 \
-    persist.bluetooth.bqr.vnd_trace_mask=0
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
 else
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.bqr.event_mask=295006 \
     persist.bluetooth.bqr.vnd_quality_mask=16 \
-    persist.bluetooth.bqr.vnd_trace_mask=0
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
 endif
 
 # Spatial Audio

From 31ea730ca1a95ea1285033147e6491c55592c54e Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Tue, 15 Aug 2023 14:38:12 +0800
Subject: [PATCH 2/5] audio: support boost mcps for handset swb

Bug:294182291
Test: manual test

Change-Id: I8d5d7d3326ca5bd26ac9557c1629e17150cb21bb
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/husky/aidl_config/audio_platform_configuration.xml | 1 +
 audio/shiba/aidl_config/audio_platform_configuration.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml
index 5700502..9314da8 100644
--- a/audio/husky/aidl_config/audio_platform_configuration.xml
+++ b/audio/husky/aidl_config/audio_platform_configuration.xml
@@ -71,6 +71,7 @@
       <argument name="VoIP_DLCHs" value="SPK:2,USB: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" />
     </tuner>
     <tuner type="capture" name="gs_capture" />
diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml
index 5700502..9314da8 100644
--- a/audio/shiba/aidl_config/audio_platform_configuration.xml
+++ b/audio/shiba/aidl_config/audio_platform_configuration.xml
@@ -71,6 +71,7 @@
       <argument name="VoIP_DLCHs" value="SPK:2,USB: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" />
     </tuner>
     <tuner type="capture" name="gs_capture" />

From e66ffc5339f9b9fcac5a8e1ad87b3f11a5f36b44 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 16 Aug 2023 16:50:06 +0000
Subject: [PATCH 3/5] Update lock icon padding which is also used for UDFPS

Test: manual
Bug: 295213294
Change-Id: I8daa81975c95a3c6708df1c997599fdd177d7e8c
---
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 60c4da6..7b628bc 100644
--- a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,4 +23,7 @@
     <dimen name="physical_volume_up_button_center_screen_location_y">1040px</dimen>
     <dimen name="physical_volume_down_button_center_screen_location_y">1174px</dimen>
 
+    <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with
+         display size. -->
+    <dimen name="lock_icon_padding">57px</dimen>
 </resources>

From 25112bdb4b2ab357e5ce1a730242acc2d65a795b Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 16 Aug 2023 16:50:06 +0000
Subject: [PATCH 4/5] Update lock icon padding which is also used for UDFPS

Test: manual
Bug: 295213294
Change-Id: I8daa81975c95a3c6708df1c997599fdd177d7e8c
(cherry picked from commit e66ffc5339f9b9fcac5a8e1ad87b3f11a5f36b44)
---
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 60c4da6..7b628bc 100644
--- a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,4 +23,7 @@
     <dimen name="physical_volume_up_button_center_screen_location_y">1040px</dimen>
     <dimen name="physical_volume_down_button_center_screen_location_y">1174px</dimen>
 
+    <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with
+         display size. -->
+    <dimen name="lock_icon_padding">57px</dimen>
 </resources>

From 46ef8938b750369b920c8a5631334cd2a18c4e7e Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 16 Aug 2023 19:42:46 +0000
Subject: [PATCH 5/5] Update lock icon padding (UDFPS padding) + burnIn offsets

Test: manual
Bug: 296268743
Fixes: 296268743
Change-Id: I4fea91f5b62859c0a1075a4237ffd2cf487c5668
---
 .../base/packages/SystemUI/res/values/dimens.xml           | 2 ++
 .../base/packages/SystemUI/res/values/dimens.xml           | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 7b628bc..8cec238 100644
--- a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -26,4 +26,6 @@
     <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with
          display size. -->
     <dimen name="lock_icon_padding">57px</dimen>
+
+    <dimen name="udfps_burn_in_offset_y">19px</dimen>
 </resources>
diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 408d919..0592ba2 100644
--- a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,4 +23,11 @@
     <dimen name="physical_volume_up_button_center_screen_location_y">1000px</dimen>
     <dimen name="physical_volume_down_button_center_screen_location_y">1160px</dimen>
 
+    <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with
+         display size. -->
+    <dimen name="lock_icon_padding">50px</dimen>
+
+    <!-- Offset should not be more than 1mm -->
+    <dimen name="udfps_burn_in_offset_x">6px</dimen>
+    <dimen name="udfps_burn_in_offset_y">17px</dimen>
 </resources>