From 97ef10a1aa9a2983e6e0e7cfe1fd60ee02bb6367 Mon Sep 17 00:00:00 2001 From: Lily Lin Date: Mon, 13 Jun 2022 20:05:02 +0800 Subject: [PATCH 1/4] Enable read/write access to st33spi_state for euiccpixel_app Bug: 231522746 Test: Confirm L10 can read/write st33spi_state Change-Id: Ib3cd744dd9c829ea8113e52b0befee77eed8567c --- conf/init.lynx.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/init.lynx.rc b/conf/init.lynx.rc index ffaec61..ac7632a 100644 --- a/conf/init.lynx.rc +++ b/conf/init.lynx.rc @@ -38,6 +38,11 @@ on post-fs-data chown system system /dev/goodix_fp exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app +# Allow secure_element group to read / write ST33 SPI state +on post-fs-data + chown secure_element secure_element /sys/class/st33spi/st33spi/st33spi_state + chmod 0660 /sys/class/st33spi/st33spi/st33spi_state + # Wifi on property:sys.boot_completed=1 write /sys/bus/platform/drivers/cnss2/qcom,cnss-qca6490/fs_ready 1 From 7a468b29700e9680dc050ed738209d8295724087 Mon Sep 17 00:00:00 2001 From: Cheney Ni Date: Sun, 12 Jun 2022 18:19:02 +0000 Subject: [PATCH 2/4] Bluetooth: Refine Bluetooth HAL manifest Remove duplicated manifests which are included at bluetooth/manifest_bluetooth.xml. Bug: 203055537 Test: lshal to see Bluetooth HAL services Change-Id: Ib39f208245c9ef476285898606289d29717ed8ca Merged-In: Ib39f208245c9ef476285898606289d29717ed8ca --- manifest.xml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/manifest.xml b/manifest.xml index 6688f36..8321c15 100644 --- a/manifest.xml +++ b/manifest.xml @@ -84,24 +84,6 @@ default - - android.hardware.bluetooth - hwbinder - 1.1 - - IBluetoothHci - default - - - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - android.hardware.boot hwbinder @@ -131,33 +113,6 @@ default - - hardware.google.bluetooth.bt_channel_avoidance - hwbinder - 1.0 - - IBTChannelAvoidance - default - - - - hardware.google.bluetooth.sar - hwbinder - 1.1 - - IBluetoothSar - default - - - - hardware.google.bluetooth.ccc - hwbinder - 1.1 - - IBluetoothCcc - default - - vendor.google.google_battery hwbinder From 31019e12e1da495a3f5524df6535cb46c6053f10 Mon Sep 17 00:00:00 2001 From: Cheney Ni Date: Sun, 12 Jun 2022 18:07:19 +0000 Subject: [PATCH 3/4] BluetoothSar: Support SAR version 1.1 Add build flag: TARGET_USE_QTI_BT_SAR_V1_1 to control IBluetoothSar @1.1 Bug: 203055537 Test: bluetooth_sar_test Change-Id: I81f79d08ad92d2b393d438739640f051e94d0426 --- bluetooth/qti_default.mk | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index d41e086..a599a3f 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -28,23 +28,31 @@ TARGET_BLUETOOTH_UART_DEVICE = "/dev/ttySAC18" UART_USE_TERMIOS_AFC = true TARGET_USE_QTI_BT_IBS = false TARGET_USE_QTI_BT_OBS = false -TARGET_USE_QTI_BT_SAR = true +TARGET_USE_QTI_BT_SAR_V1_1 = true TARGET_USE_QTI_BT_CHANNEL_AVOIDANCE = true + +# IBluetoothHci @1.1 / @1.0 ifeq ($(TARGET_BLUETOOTH_HCI_V1_1),true) PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-impl-qti else PRODUCT_PACKAGES += android.hardware.bluetooth@1.0-impl-qti endif +# IBluetoothSar @1.1 / @1.0 +ifeq ($(TARGET_USE_QTI_BT_SAR_V1_1),true) + PRODUCT_PACKAGES += hardware.google.bluetooth.sar@1.1-impl +else ifeq ($(TARGET_USE_QTI_BT_SAR),true) + PRODUCT_PACKAGES += hardware.google.bluetooth.sar@1.0-impl +endif PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-service-qti \ - hardware.google.bluetooth.sar@1.0-impl \ hardware.google.bluetooth.bt_channel_avoidance@1.0-impl # Bluetooth SAR test tools -PRODUCT_PACKAGES_DEBUG += \ - bluetooth_sar_test +ifeq ($(TARGET_USE_QTI_BT_SAR_V1_1)$(TARGET_USE_QTI_BT_SAR),true) + PRODUCT_PACKAGES_DEBUG += bluetooth_sar_test +endif -# Bluetooth SoC, BDA in device tree, and WiPower +# Bluetooth (Vendor) SoC, BDA in device tree, and WiPower PRODUCT_PROPERTY_OVERRIDES += \ vendor.qcom.bluetooth.soc=hastings \ ro.vendor.bt.bdaddr_path=/proc/device-tree/chosen/config/bt_addr \ From 48138638a634e241a74f42e2460cbca234dd25f0 Mon Sep 17 00:00:00 2001 From: Patty Huang Date: Mon, 30 May 2022 20:10:26 +0800 Subject: [PATCH 4/4] Enable broadcast and unicast profile by default Bug: 234337037 Test: Make sure le audio broadcast and unicast profiles are default enabled Change-Id: Ib8beccc1d742c90ba6fd510ae23d5e0221fdddd5 --- device-lynx.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/device-lynx.mk b/device-lynx.mk index 4a0d2ae..5e7a3c6 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -186,5 +186,12 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Bluetooth LE Audio PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_switcher.supported=true - + ro.bluetooth.leaudio_switcher.supported=true \ + bluetooth.profile.bap.broadcast.source.enabled=true \ + bluetooth.profile.bap.broadcast.assist.enabled=true \ + bluetooth.profile.bap.unicast.client.enabled=true \ + bluetooth.profile.csip.set_coordinator.enabled=true \ + bluetooth.profile.hap.client.enabled=true \ + bluetooth.profile.mcp.server.enabled=true \ + bluetooth.profile.ccp.server.enabled=true \ + bluetooth.profile.vcp.controller.enabled=true