Evolution-X-Tensor/device_google_gs-common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from topic "switch_to_aidl" into udc-d1-dev am: 22ce2ab92d am: 3969edcee6

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/22338831

Change-Id: I6849d337c37e3cdcfcfcdbf1362b4aa162de31c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ted Wang 2023-05-05 06:53:36 +00:00 • committed by Automerger Merge Worker
commit 9fab5c4eb1
6 changed files with 28 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bcmbt/bluetooth.mk
View file

@ -2,6 +2,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/broadcom/bluetooth
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.bluetooth-V1-ndk.so \ android.hardware.bluetooth-V1-ndk.so \
android.hardware.bluetooth-service.bcmbtlinux \ android.hardware.bluetooth-service.bcmbtlinux \
vendor.google.bluetooth_ext-V1-ndk.so \
bt_vendor.conf \ bt_vendor.conf \
android.hardware.bluetooth.prebuilt.xml \ android.hardware.bluetooth.prebuilt.xml \
android.hardware.bluetooth_le.prebuilt.xml android.hardware.bluetooth_le.prebuilt.xml

27
bcmbt/compatibility_matrix.xml
View file

@ -1,39 +1,28 @@
<compatibility-matrix version="1.0" type="framework" level="7"> <compatibility-matrix version="1.0" type="framework" level="7">
<hal format="hidl"> <hal format="aidl" optional="true">
<name>hardware.google.bluetooth.ccc</name> <name>vendor.google.bluetooth_ext</name>
<version>1.1</version> <version>1</version>
<interface>
<name>IBluetoothFinder</name>
<instance>default</instance>
</interface>
<fqname>IBluetoothFinder/default</fqname>
<interface> <interface>
<name>IBluetoothCcc</name> <name>IBluetoothCcc</name>
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.bt_channel_avoidance</name>
<version>1.0</version>
<interface> <interface>
<name>IBTChannelAvoidance</name> <name>IBTChannelAvoidance</name>
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.sar</name>
<version>1.1</version>
<interface> <interface>
<name>IBluetoothSar</name> <name>IBluetoothSar</name>
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal>
<hal format="hidl" optional="true">
<name>hardware.google.bluetooth.ext</name>
<version>1.0</version>
<interface> <interface>
<name>IBluetoothExt</name> <name>IBluetoothExt</name>
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal>
<hal format="hidl" optional="true">
<name>hardware.google.bluetooth.ewp</name>
<version>1.0</version>
<interface> <interface>
<name>IBluetoothEwp</name> <name>IBluetoothEwp</name>
<instance>default</instance> <instance>default</instance>

53
bcmbt/manifest_bluetooth.xml
View file

@ -4,49 +4,14 @@
<version>1</version> <version>1</version>
<fqname>IBluetoothHci/default</fqname> <fqname>IBluetoothHci/default</fqname>
</hal> </hal>
<hal format="hidl"> <hal format="aidl">
<name>hardware.google.bluetooth.bt_channel_avoidance</name> <name>vendor.google.bluetooth_ext</name>
<transport>hwbinder</transport> <version>1</version>
<version>1.0</version> <fqname>IBTChannelAvoidance/default</fqname>
<interface> <fqname>IBluetoothCcc/default</fqname>
<name>IBTChannelAvoidance</name> <fqname>IBluetoothEwp/default</fqname>
<instance>default</instance> <fqname>IBluetoothExt/default</fqname>
</interface> <fqname>IBluetoothFinder/default</fqname>
</hal> <fqname>IBluetoothSar/default</fqname>
<hal format="hidl">
<name>hardware.google.bluetooth.sar</name>
<transport>hwbinder</transport>
<version>1.1</version>
<interface>
<name>IBluetoothSar</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.ext</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IBluetoothExt</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.ccc</name>
<transport>hwbinder</transport>
<version>1.1</version>
<interface>
<name>IBluetoothCcc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>hardware.google.bluetooth.ewp</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IBluetoothEwp</name>
<instance>default</instance>
</interface>
</hal> </hal>
</manifest> </manifest>

1
bcmbt/sepolicy/hal_bluetooth_btlinux.te
View file

@ -1,4 +1,5 @@
add_hwservice(hal_bluetooth_btlinux, hal_bluetooth_coexistence_hwservice); add_hwservice(hal_bluetooth_btlinux, hal_bluetooth_coexistence_hwservice);
add_service(hal_bluetooth_btlinux, hal_bluetooth_coexistence_service);
get_prop(hal_bluetooth_btlinux, boot_status_prop) get_prop(hal_bluetooth_btlinux, boot_status_prop)
allow hal_bluetooth_btlinux sysfs_bluetooth_writable:file rw_file_perms; allow hal_bluetooth_btlinux sysfs_bluetooth_writable:file rw_file_perms;

2
bcmbt/sepolicy/service.te Normal file
View file

@ -0,0 +1,2 @@
# Bluetooth HAL extension
type hal_bluetooth_coexistence_service, hal_service_type, service_manager_type;

7
bcmbt/sepolicy/service_contexts Normal file
View file

@ -0,0 +1,7 @@
# Bluetooth HAL extension
vendor.google.bluetooth_ext.IBTChannelAvoidance/default u:object_r:hal_bluetooth_coexistence_service:s0
vendor.google.bluetooth_ext.IBluetoothSar/default u:object_r:hal_bluetooth_coexistence_service:s0
vendor.google.bluetooth_ext.IBluetoothCcc/default u:object_r:hal_bluetooth_coexistence_service:s0
vendor.google.bluetooth_ext.IBluetoothEwp/default u:object_r:hal_bluetooth_coexistence_service:s0
vendor.google.bluetooth_ext.IBluetoothExt/default u:object_r:hal_bluetooth_coexistence_service:s0
vendor.google.bluetooth_ext.IBluetoothFinder/default u:object_r:hal_bluetooth_coexistence_service:s0