From c4a17b8196622661c41d696e3f7e6a24eefb6779 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Thu, 1 Jun 2023 05:08:25 +0000 Subject: [PATCH] Bluetooth: update SB3/HK3 BT defatul SAR tables Bug: 285219292 Test: make Change-Id: I72a9952dc00ec48187a6fbeb1479c5cca5f372e7 --- bluetooth/bluetooth_power_limits_husky.csv | 34 +++++++++++++++++++ bluetooth/bluetooth_power_limits_husky_JP.csv | 34 +++++++++++++++++++ bluetooth/bluetooth_power_limits_shiba.csv | 34 +++++++++++++++++++ bluetooth/bluetooth_power_limits_shiba_JP.csv | 34 +++++++++++++++++++ device-husky.mk | 5 +++ device-shiba.mk | 5 +++ 6 files changed, 146 insertions(+) create mode 100644 bluetooth/bluetooth_power_limits_husky.csv create mode 100644 bluetooth/bluetooth_power_limits_husky_JP.csv create mode 100644 bluetooth/bluetooth_power_limits_shiba.csv create mode 100644 bluetooth/bluetooth_power_limits_shiba_JP.csv diff --git a/bluetooth/bluetooth_power_limits_husky.csv b/bluetooth/bluetooth_power_limits_husky.csv new file mode 100644 index 0000000..8cd2661 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_husky.csv @@ -0,0 +1,34 @@ +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 +off,off,off,off,off,on,76,66,74,76,66,74,64,54,66,64,54,66 +off,off,off,off,on,on,76,66,74,76,66,74,64,54,66,64,54,66 +off,off,off,on,off,on,74,66,72,76,66,74,64,54,66,64,54,66 +off,off,off,on,on,on,74,66,72,76,66,74,64,54,66,64,54,66 +off,off,on,off,off,on,74,66,72,76,66,74,64,54,66,64,54,66 +off,off,on,off,on,on,74,66,72,76,66,74,64,54,66,64,54,66 +off,off,on,on,off,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,off,on,on,on,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,on,off,off,off,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,on,off,off,on,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,on,off,on,off,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,on,off,on,on,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,on,on,off,off,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,on,on,off,on,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,on,on,on,off,on,66,66,64,68,66,66,64,54,64,64,54,64 +off,on,on,on,on,on,66,66,64,68,66,66,64,54,64,64,54,64 +on,off,off,off,off,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,off,off,off,on,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,off,off,on,off,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,off,off,on,on,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,off,on,off,off,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,off,on,off,on,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,off,on,on,off,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,off,on,on,on,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,on,off,off,off,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,on,off,off,on,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,on,off,on,off,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,on,off,on,on,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,on,on,off,off,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,on,on,off,on,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,on,on,on,off,any,46,46,46,58,58,56,46,46,46,46,46,50 +on,on,on,on,on,any,46,46,46,58,58,56,46,46,46,46,46,50 +off,any,any,any,any,off,76,66,74,76,66,74,64,54,66,64,54,66 \ No newline at end of file diff --git a/bluetooth/bluetooth_power_limits_husky_JP.csv b/bluetooth/bluetooth_power_limits_husky_JP.csv new file mode 100644 index 0000000..be4475e --- /dev/null +++ b/bluetooth/bluetooth_power_limits_husky_JP.csv @@ -0,0 +1,34 @@ +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 +off,off,off,off,off,on,68,68,36,70,66,40,56,54,28,56,54,26 +off,off,off,off,on,on,68,68,36,70,66,40,56,54,28,56,54,26 +off,off,off,on,off,on,68,68,36,70,66,40,56,54,28,56,54,26 +off,off,off,on,on,on,68,68,36,70,66,40,56,54,28,56,54,26 +off,off,on,off,off,on,68,68,36,70,66,40,56,54,28,56,54,26 +off,off,on,off,on,on,68,68,36,70,66,40,56,54,28,56,54,26 +off,off,on,on,off,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,off,on,on,on,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,on,off,off,off,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,on,off,off,on,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,on,off,on,off,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,on,off,on,on,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,on,on,off,off,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,on,on,off,on,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,on,on,on,off,on,46,46,36,70,66,40,56,54,28,56,54,26 +off,on,on,on,on,on,46,46,36,70,66,40,56,54,28,56,54,26 +on,off,off,off,off,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,off,off,off,on,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,off,off,on,off,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,off,off,on,on,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,off,on,off,off,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,off,on,off,on,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,off,on,on,off,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,off,on,on,on,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,on,off,off,off,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,on,off,off,on,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,on,off,on,off,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,on,off,on,on,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,on,on,off,off,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,on,on,off,on,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,on,on,on,off,any,46,46,36,70,66,40,56,54,28,56,54,26 +on,on,on,on,on,any,46,46,36,70,66,40,56,54,28,56,54,26 +off,any,any,any,any,off,68,68,36,70,66,40,56,54,28,56,54,26 \ No newline at end of file diff --git a/bluetooth/bluetooth_power_limits_shiba.csv b/bluetooth/bluetooth_power_limits_shiba.csv new file mode 100644 index 0000000..ad7f2f6 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_shiba.csv @@ -0,0 +1,34 @@ +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 +off,off,off,off,off,on,74,64,76,76,66,74,64,52,72,66,54,70 +off,off,off,off,on,on,74,64,76,76,66,74,64,52,72,66,54,70 +off,off,off,on,off,on,74,64,76,76,66,74,64,52,72,66,54,70 +off,off,off,on,on,on,74,64,76,76,66,74,64,52,72,66,54,70 +off,off,on,off,off,on,74,64,76,76,66,74,64,52,72,66,54,70 +off,off,on,off,on,on,74,64,76,76,66,74,64,52,72,66,54,70 +off,off,on,on,off,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,off,on,on,on,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,on,off,off,off,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,on,off,off,on,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,on,off,on,off,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,on,off,on,on,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,on,on,off,off,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,on,on,off,on,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,on,on,on,off,on,64,64,66,66,66,64,64,52,66,66,54,64 +off,on,on,on,on,on,64,64,66,66,66,64,64,52,66,66,54,64 +on,off,off,off,off,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,off,off,off,on,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,off,off,on,off,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,off,off,on,on,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,off,on,off,off,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,off,on,off,on,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,off,on,on,off,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,off,on,on,on,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,on,off,off,off,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,on,off,off,on,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,on,off,on,off,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,on,off,on,on,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,on,on,off,off,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,on,on,off,on,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,on,on,on,off,any,46,46,46,48,48,50,46,46,46,48,48,50 +on,on,on,on,on,any,46,46,46,48,48,50,46,46,46,48,48,50 +off,any,any,any,any,off,74,64,76,76,66,74,64,52,72,66,54,70 \ No newline at end of file diff --git a/bluetooth/bluetooth_power_limits_shiba_JP.csv b/bluetooth/bluetooth_power_limits_shiba_JP.csv new file mode 100644 index 0000000..0dab434 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_shiba_JP.csv @@ -0,0 +1,34 @@ +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 +off,off,off,off,off,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,off,off,off,on,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,off,off,on,off,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,off,off,on,on,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,off,on,off,off,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,off,on,off,on,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,off,on,on,off,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,off,on,on,on,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,on,off,off,off,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,on,off,off,on,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,on,off,on,off,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,on,off,on,on,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,on,on,off,off,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,on,on,off,on,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,on,on,on,off,on,64,66,36,68,70,36,56,54,26,54,56,26 +off,on,on,on,on,on,64,66,36,68,70,36,56,54,26,54,56,26 +on,off,off,off,off,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,off,off,off,on,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,off,off,on,off,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,off,off,on,on,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,off,on,off,off,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,off,on,off,on,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,off,on,on,off,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,off,on,on,on,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,on,off,off,off,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,on,off,off,on,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,on,off,on,off,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,on,off,on,on,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,on,on,off,off,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,on,on,off,on,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,on,on,on,off,any,64,66,36,68,70,36,56,54,26,54,56,26 +on,on,on,on,on,any,64,66,36,68,70,36,56,54,26,54,56,26 +off,any,any,any,any,off,64,66,36,68,70,36,56,54,26,54,56,26 \ No newline at end of file diff --git a/device-husky.mk b/device-husky.mk index 7d657af..b9017ca 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -93,6 +93,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Bluetooth Tx power caps +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv + # POF PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.finder.supported=true diff --git a/device-shiba.mk b/device-shiba.mk index 487b344..1f126e6 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -83,6 +83,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Bluetooth Tx power caps +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv + # POF PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.finder.supported=true