Merge "Bluetooth: add BT SAR tables" into tm-qpr-dev am: 7fb3efe189 am: 1e1e5a6a4d

Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/20895162

Change-Id: Ibd1de958075442eae9f28ab7306fdb94f1c57441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Huang 2023-01-07 08:39:56 +00:00 committed by Automerger Merge Worker
commit 3a37efcf35
6 changed files with 20 additions and 1 deletions

View file

@ -0,0 +1,2 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
any,any,any,any,any,any,61,27,19,61,27,19,61,27,19,61,27,19
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1
2 any any any any any any 61 27 19 61 27 19 61 27 19 61 27 19

View file

@ -0,0 +1,2 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
any,any,any,any,any,any,61,61,56,61,61,56,61,61,56,61,61,56
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1
2 any any any any any any 61 61 56 61 61 56 61 61 56 61 61 56

View file

@ -0,0 +1,2 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
any,any,any,any,any,any,62,35,19,62,35,19,62,35,19,62,35,19
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1
2 any any any any any any 62 35 19 62 35 19 62 35 19 62 35 19

View file

@ -0,0 +1,2 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
any,any,any,any,any,any,61,27,28,61,27,28,61,27,28,61,27,28
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1
2 any any any any any any 61 27 28 61 27 28 61 27 28 61 27 28

View file

@ -0,0 +1,2 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
any,any,any,any,any,any,61,61,56,61,61,56,61,61,56,61,61,56
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1
2 any any any any any any 61 61 56 61 61 56 61 61 56 61 61 56

View file

@ -24,7 +24,16 @@ PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.synabtlinux \
android.hardware.bluetooth_le.prebuilt.xml android.hardware.bluetooth_le.prebuilt.xml
# Bluetooth SAR test tools # Bluetooth SAR test tools
PRODUCT_PACKAGES_DEBUG += bluetooth_sar_test PRODUCT_PACKAGES_DEBUG += bt_sar_test
# Bluetooth Tx power caps
PRODUCT_COPY_FILES += \
device/google/tangorpro/bluetooth/bluetooth_power_limits_tangorpro.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
device/google/tangorpro/bluetooth/bluetooth_power_limits_tangorpro_GTU8P_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GTU8P_CA.csv \
device/google/tangorpro/bluetooth/bluetooth_power_limits_tangorpro_GTU8P_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GTU8P_EU.csv \
device/google/tangorpro/bluetooth/bluetooth_power_limits_tangorpro_GTU8P_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GTU8P_JP.csv \
device/google/tangorpro/bluetooth/bluetooth_power_limits_tangorpro_GTU8P_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GTU8P_US.csv \
# default BDADDR for EVB only # default BDADDR for EVB only
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"