From 3674b322d7cfe66d248cbe447acae07c1ab62f61 Mon Sep 17 00:00:00 2001 From: eddielan Date: Wed, 10 May 2023 14:22:54 +0800 Subject: [PATCH 1/2] fingerprint: Add TOUCH_TO_UNLOCK_ANYTIME flag Bug: 277165756 Test: Build pass & manually unlock device Change-Id: I881d63441eeaf61703c9cef3fbefb84f4ddddcb8 --- fingerprint_config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/fingerprint_config.mk b/fingerprint_config.mk index fa35c73..c28cb6a 100644 --- a/fingerprint_config.mk +++ b/fingerprint_config.mk @@ -6,4 +6,5 @@ else # Non factory build, use fingerprint AIDL version GOOGLE_CONFIG_POWER_NODE=/dev/input/event1 GOOGLE_CONFIG_FP_STATUS=1 +GOOGLE_CONFIG_TOUCH_TO_UNLOCK_ANYTIME=1 endif From a3108302d36a096fc708053c7b0380bf823526c1 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 17 May 2023 09:15:01 -0700 Subject: [PATCH 2/2] tangorpro: Disable ccc for UWB vendor stack Bug: 282165026 Test: None Change-Id: I41924ee69a73776a78d87fe8df6df5f5927ea6a9 --- uwb/UWB-calibration-ce.conf | 1 + uwb/UWB-calibration-fcc.conf | 1 + uwb/UWB-calibration-jp.conf | 1 + uwb/UWB-calibration.conf | 1 + 4 files changed, 4 insertions(+) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index cd3e956..0002568 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -130,6 +130,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 [HAL]minimum_system_offset_uwbtime0=300 +[HAL]ccc_enabled=0 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 17b1894..4e7d2de 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -130,6 +130,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 [HAL]minimum_system_offset_uwbtime0=300 +[HAL]ccc_enabled=0 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 7c9b43c..417f7f8 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -130,6 +130,7 @@ restricted_channels=0x20 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 [HAL]minimum_system_offset_uwbtime0=300 +[HAL]ccc_enabled=0 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 17b1894..4e7d2de 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -130,6 +130,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 [HAL]minimum_system_offset_uwbtime0=300 +[HAL]ccc_enabled=0 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500