diff --git a/audio/lynx/config/audio_platform_configuration.xml b/audio/lynx/config/audio_platform_configuration.xml index 4ebfced..fdf48e9 100644 --- a/audio/lynx/config/audio_platform_configuration.xml +++ b/audio/lynx/config/audio_platform_configuration.xml @@ -232,6 +232,9 @@ + + + diff --git a/bluetooth/bluetooth_power_limits_L10_EU.csv b/bluetooth/bluetooth_power_limits_L10_EU.csv new file mode 100644 index 0000000..e16b5c2 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_L10_EU.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,68,40,76,68,40,76,68,40,76,68,40 +off,off,off,off,on,on,76,68,40,76,68,40,76,68,40,76,68,40 +off,off,off,on,off,on,76,68,40,76,68,40,76,68,40,76,68,40 +off,off,off,on,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,off,on,off,off,on,76,68,40,76,68,40,76,68,40,76,68,40 +off,off,on,off,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,off,on,on,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,off,on,on,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,off,off,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,off,off,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,off,on,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,off,on,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,on,off,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,on,off,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,on,on,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,on,on,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +on,off,off,off,off,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,off,off,on,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,off,on,off,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,off,on,on,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,on,off,off,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,on,off,on,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,on,on,off,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,on,on,on,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,on,off,off,off,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,off,off,on,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,off,on,off,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,off,on,on,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,on,off,off,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,on,off,on,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,on,on,off,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,on,on,on,any,72,68,40,72,68,40,72,68,40,72,68,40 +off,any,any,any,any,off,76,68,40,76,68,40,76,68,40,76,68,40 diff --git a/bluetooth/bluetooth_power_limits_L10_JP.csv b/bluetooth/bluetooth_power_limits_L10_JP.csv new file mode 100644 index 0000000..e16b5c2 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_L10_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,76,68,40,76,68,40,76,68,40,76,68,40 +off,off,off,off,on,on,76,68,40,76,68,40,76,68,40,76,68,40 +off,off,off,on,off,on,76,68,40,76,68,40,76,68,40,76,68,40 +off,off,off,on,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,off,on,off,off,on,76,68,40,76,68,40,76,68,40,76,68,40 +off,off,on,off,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,off,on,on,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,off,on,on,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,off,off,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,off,off,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,off,on,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,off,on,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,on,off,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,on,off,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,on,on,off,on,72,68,40,72,68,40,72,68,40,72,68,40 +off,on,on,on,on,on,72,68,40,72,68,40,72,68,40,72,68,40 +on,off,off,off,off,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,off,off,on,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,off,on,off,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,off,on,on,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,on,off,off,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,on,off,on,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,on,on,off,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,off,on,on,on,any,76,68,40,76,68,40,76,68,40,76,68,40 +on,on,off,off,off,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,off,off,on,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,off,on,off,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,off,on,on,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,on,off,off,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,on,off,on,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,on,on,off,any,72,68,40,72,68,40,72,68,40,72,68,40 +on,on,on,on,on,any,72,68,40,72,68,40,72,68,40,72,68,40 +off,any,any,any,any,off,76,68,40,76,68,40,76,68,40,76,68,40 diff --git a/bluetooth/bluetooth_power_limits_L10_US.csv b/bluetooth/bluetooth_power_limits_L10_US.csv new file mode 100644 index 0000000..9ec5ec9 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_L10_US.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,68,76,76,68,76,76,68,76,76,68,76 +off,off,off,off,on,on,76,68,76,76,68,76,76,68,76,76,68,76 +off,off,off,on,off,on,76,68,76,76,68,76,76,68,76,76,68,76 +off,off,off,on,on,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,off,on,off,off,on,76,68,76,76,68,76,76,68,76,76,68,76 +off,off,on,off,on,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,off,on,on,off,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,off,on,on,on,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,on,off,off,off,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,on,off,off,on,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,on,off,on,off,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,on,off,on,on,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,on,on,off,off,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,on,on,off,on,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,on,on,on,off,on,56,56,56,56,56,56,56,56,56,56,56,56 +off,on,on,on,on,on,56,56,56,56,56,56,56,56,56,56,56,56 +on,off,off,off,off,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,off,off,off,on,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,off,off,on,off,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,off,off,on,on,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,off,on,off,off,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,off,on,off,on,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,off,on,on,off,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,off,on,on,on,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,on,off,off,off,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,on,off,off,on,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,on,off,on,off,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,on,off,on,on,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,on,on,off,off,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,on,on,off,on,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,on,on,on,off,any,44,44,44,44,44,44,44,44,44,44,44,44 +on,on,on,on,on,any,44,44,44,44,44,44,44,44,44,44,44,44 +off,any,any,any,any,off,76,68,76,76,68,76,76,68,76,76,68,76 diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 3fc3172..a6abd5c 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -69,6 +69,12 @@ PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-service-qti \ hardware.google.bluetooth.bt_channel_avoidance@1.0-impl +# Bluetooth SAR Tx power caps +PRODUCT_COPY_FILES += \ + device/google/lynx/bluetooth/bluetooth_power_limits_L10_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ + device/google/lynx/bluetooth/bluetooth_power_limits_L10_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ + device/google/lynx/bluetooth/bluetooth_power_limits_L10_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv + # Bluetooth SAR test tools ifeq ($(TARGET_USE_QTI_BT_SAR_V1_1)$(TARGET_USE_QTI_BT_SAR),true) PRODUCT_PACKAGES_DEBUG += bluetooth_sar_test diff --git a/device-lynx.mk b/device-lynx.mk index 286854f..aff5ca8 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -21,6 +21,7 @@ $(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-ve $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/device-vendor-lynx.mk) +$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/device-vendor.mk) DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index d1bcc45..616a01a 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -21,5 +21,6 @@ USES_DEVICE_GOOGLE_LYNX := true include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +-include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk include device/google/lynx-sepolicy/lynx-sepolicy.mk -include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk \ No newline at end of file +include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk