Snap for 12543847 from ca74f2730a
to 25Q1-release
Change-Id: Ib76ed9fdaeaeddafcf5d9c1eb6f5e41669200b69
This commit is contained in:
commit
bd6c469fc0
12 changed files with 134 additions and 0 deletions
16
bluetooth/bluetooth.mk
Normal file
16
bluetooth/bluetooth.mk
Normal file
|
@ -0,0 +1,16 @@
|
|||
PRODUCT_SOONG_NAMESPACES += vendor/google/connectivity/bluetooth/common
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.bluetooth-V1-ndk.so \
|
||||
android.hardware.bluetooth.finder-V1-ndk.so \
|
||||
android.hardware.bluetooth.ranging-V1-ndk.so \
|
||||
android.hardware.bluetooth-service.pixel \
|
||||
vendor.google.bluetooth_ext-V1-ndk.so \
|
||||
bt_vendor.conf \
|
||||
android.hardware.bluetooth.prebuilt.xml \
|
||||
android.hardware.bluetooth_le.prebuilt.xml
|
||||
|
||||
BOARD_SEPOLICY_DIRS += device/google/gs-common/bluetooth/sepolicy
|
||||
BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
|
||||
|
||||
DEVICE_MANIFEST_FILE += device/google/gs-common/bluetooth/manifest_bluetooth.xml
|
||||
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/bluetooth/compatibility_matrix.xml
|
30
bluetooth/compatibility_matrix.xml
Normal file
30
bluetooth/compatibility_matrix.xml
Normal file
|
@ -0,0 +1,30 @@
|
|||
<compatibility-matrix version="1.0" type="framework">
|
||||
<hal format="aidl" optional="true">
|
||||
<name>vendor.google.bluetooth_ext</name>
|
||||
<version>1</version>
|
||||
<interface>
|
||||
<name>IBluetoothFinder</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
<interface>
|
||||
<name>IBluetoothCcc</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
<interface>
|
||||
<name>IBTChannelAvoidance</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
<interface>
|
||||
<name>IBluetoothSar</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
<interface>
|
||||
<name>IBluetoothExt</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
<interface>
|
||||
<name>IBluetoothEwp</name>
|
||||
<instance>default</instance>
|
||||
</interface>
|
||||
</hal>
|
||||
</compatibility-matrix>
|
27
bluetooth/manifest_bluetooth.xml
Normal file
27
bluetooth/manifest_bluetooth.xml
Normal file
|
@ -0,0 +1,27 @@
|
|||
<manifest version="1.0" type="device">
|
||||
<hal format="aidl">
|
||||
<name>android.hardware.bluetooth</name>
|
||||
<version>1</version>
|
||||
<fqname>IBluetoothHci/default</fqname>
|
||||
</hal>
|
||||
<hal format="aidl">
|
||||
<name>android.hardware.bluetooth.finder</name>
|
||||
<version>1</version>
|
||||
<fqname>IBluetoothFinder/default</fqname>
|
||||
</hal>
|
||||
<hal format="aidl">
|
||||
<name>android.hardware.bluetooth.ranging</name>
|
||||
<version>1</version>
|
||||
<fqname>IBluetoothChannelSounding/default</fqname>
|
||||
</hal>
|
||||
<hal format="aidl">
|
||||
<name>vendor.google.bluetooth_ext</name>
|
||||
<version>1</version>
|
||||
<fqname>IBTChannelAvoidance/default</fqname>
|
||||
<fqname>IBluetoothCcc/default</fqname>
|
||||
<fqname>IBluetoothEwp/default</fqname>
|
||||
<fqname>IBluetoothExt/default</fqname>
|
||||
<fqname>IBluetoothFinder/default</fqname>
|
||||
<fqname>IBluetoothSar/default</fqname>
|
||||
</hal>
|
||||
</manifest>
|
3
bluetooth/sepolicy/device.te
Normal file
3
bluetooth/sepolicy/device.te
Normal file
|
@ -0,0 +1,3 @@
|
|||
# Bt Wifi Coexistence device
|
||||
type wb_coexistence_dev, dev_type;
|
||||
|
6
bluetooth/sepolicy/file_contexts
Normal file
6
bluetooth/sepolicy/file_contexts
Normal file
|
@ -0,0 +1,6 @@
|
|||
# Bluetooth
|
||||
/vendor/bin/hw/android\.hardware\.bluetooth-service\.pixel u:object_r:hal_bluetooth_btlinux_exec:s0
|
||||
|
||||
/dev/wbrc u:object_r:wb_coexistence_dev:s0
|
||||
/dev/ttySAC16 u:object_r:hci_attach_dev:s0
|
||||
|
8
bluetooth/sepolicy/genfs_contexts
Normal file
8
bluetooth/sepolicy/genfs_contexts
Normal file
|
@ -0,0 +1,8 @@
|
|||
# Bluetooth pin control device node
|
||||
genfscon sysfs /devices/platform/odm/odm:btbcm/rfkill/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0
|
||||
genfscon sysfs /devices/platform/odm/odm:btbcm/rfkill/rfkill2/state u:object_r:sysfs_bluetooth_writable:s0
|
||||
genfscon proc /bluetooth/sleep/lpm u:object_r:proc_bluetooth_writable:s0
|
||||
genfscon proc /bluetooth/sleep/btwrite u:object_r:proc_bluetooth_writable:s0
|
||||
genfscon proc /bluetooth/sleep/btwake u:object_r:proc_bluetooth_writable:s0
|
||||
genfscon proc /bluetooth/timesync u:object_r:proc_bluetooth_writable:s0
|
||||
|
18
bluetooth/sepolicy/hal_bluetooth_btlinux.te
Normal file
18
bluetooth/sepolicy/hal_bluetooth_btlinux.te
Normal file
|
@ -0,0 +1,18 @@
|
|||
# coexistence device file node
|
||||
add_hwservice(hal_bluetooth_btlinux, hal_bluetooth_coexistence_hwservice);
|
||||
add_service(hal_bluetooth_btlinux, hal_bluetooth_coexistence_service);
|
||||
allow hal_bluetooth_btlinux wb_coexistence_dev:chr_file rw_file_perms;
|
||||
|
||||
# power stats
|
||||
allow hal_bluetooth_btlinux hal_power_stats_vendor_service:service_manager find;
|
||||
binder_call(hal_bluetooth_btlinux, hal_power_stats_default)
|
||||
|
||||
# bt firmware dump
|
||||
allow hal_bluetooth_btlinux aconfig_storage_metadata_file:dir search;
|
||||
allow hal_bluetooth_btlinux sscoredump_vendor_data_crashinfo_file:dir { read search };
|
||||
|
||||
userdebug_or_eng(`
|
||||
allow hal_bluetooth_btlinux sscoredump_vendor_data_coredump_file:dir create_dir_perms;
|
||||
allow hal_bluetooth_btlinux sscoredump_vendor_data_coredump_file:file create_file_perms;
|
||||
allow hal_bluetooth_btlinux logbuffer_device:chr_file r_file_perms;
|
||||
')
|
3
bluetooth/sepolicy/hwservice.te
Normal file
3
bluetooth/sepolicy/hwservice.te
Normal file
|
@ -0,0 +1,3 @@
|
|||
# Bluetooth HAL extension
|
||||
type hal_bluetooth_coexistence_hwservice, hwservice_manager_type, vendor_hwservice_type;
|
||||
|
6
bluetooth/sepolicy/hwservice_contexts
Normal file
6
bluetooth/sepolicy/hwservice_contexts
Normal file
|
@ -0,0 +1,6 @@
|
|||
# Bluetooth HAL extension
|
||||
hardware.google.bluetooth.bt_channel_avoidance::IBTChannelAvoidance u:object_r:hal_bluetooth_coexistence_hwservice:s0
|
||||
hardware.google.bluetooth.sar::IBluetoothSar u:object_r:hal_bluetooth_coexistence_hwservice:s0
|
||||
hardware.google.bluetooth.ccc::IBluetoothCcc u:object_r:hal_bluetooth_coexistence_hwservice:s0
|
||||
hardware.google.bluetooth.ewp::IBluetoothEwp u:object_r:hal_bluetooth_coexistence_hwservice:s0
|
||||
hardware.google.bluetooth.ext::IBluetoothExt u:object_r:hal_bluetooth_coexistence_hwservice:s0
|
2
bluetooth/sepolicy/service.te
Normal file
2
bluetooth/sepolicy/service.te
Normal file
|
@ -0,0 +1,2 @@
|
|||
# Bluetooth HAL extension
|
||||
type hal_bluetooth_coexistence_service, hal_service_type, service_manager_type;
|
7
bluetooth/sepolicy/service_contexts
Normal file
7
bluetooth/sepolicy/service_contexts
Normal 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
|
|
@ -8,3 +8,11 @@ flag {
|
|||
description: "This flag controls the removal of utilizing Capo at the HAL level"
|
||||
bug: "290223630"
|
||||
}
|
||||
|
||||
flag {
|
||||
name: "enable_pwle_v2"
|
||||
namespace: "vibrator"
|
||||
is_exported: true
|
||||
description: "This flag enables the PWLE V2 APIs guarded by the CAP_COMPOSE_PWLE_EFFECTS_V2 compatability"
|
||||
bug: "346570576"
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue