From 6f3b7806be8f047511b012d8ca44d289fdf3b4d6 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Wed, 20 Jul 2022 17:54:34 +0800
Subject: [PATCH 1/4] audio: enable BAACL (amp only)

Bug: 227715448
Test: manual test

Signed-off-by: Jasmine Cha <chajasmine@google.com>
Change-Id: I4f86f3744a7aeaaf67764d8db7f9c2641ca62a83
---
 audio/lynx/config/audio_platform_configuration.xml | 3 +++
 1 file changed, 3 insertions(+)

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 @@
     </dsp_latency>
 
     <soundcard_name name="google,aoc-snd-card" />
+    <features>
+        <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
+    </features>
 
     <cfg_attr>
         <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>

From cdfc6970cc238cd752d45905b7d770941ea8ba32 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 25 Jul 2022 17:01:57 -0700
Subject: [PATCH 2/4] Add AOSP support for Lynx

We will have a 'vendor' project containing proprietary blobs
to be able to build and flash Pixel device when vendor source is not
available.
The project name is
platform/vendor/aosp/google_devices/lynx

and the path is
vendor/google_devices/lynx

TEST:make

BUG: 240203789
Change-Id: I33af4dce2b60f5de21d8998e445d2f8abd2b7e01
---
 device-lynx.mk      | 1 +
 lynx/BoardConfig.mk | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/device-lynx.mk b/device-lynx.mk
index ec845a1..dd39427 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

From ec385d24c9c089c9068952d2f9732caa8d13a167 Mon Sep 17 00:00:00 2001
From: Cheney Ni <cheneyni@google.com>
Date: Fri, 22 Jul 2022 07:22:24 +0000
Subject: [PATCH 3/4] Bluetooth: Preliminary BT SAR table for dogfood

Bug: 239899228
Test: Pass SAR manually tests
Change-Id: Id75818fc7ed844c837e5be2cf4e0ee4b8eabd087
---
 bluetooth/bluetooth_power_limits_L10_EU.csv | 34 +++++++++++++++++++++
 bluetooth/bluetooth_power_limits_L10_JP.csv | 34 +++++++++++++++++++++
 bluetooth/bluetooth_power_limits_L10_US.csv | 34 +++++++++++++++++++++
 bluetooth/qti_default.mk                    |  6 ++++
 4 files changed, 108 insertions(+)
 create mode 100644 bluetooth/bluetooth_power_limits_L10_EU.csv
 create mode 100644 bluetooth/bluetooth_power_limits_L10_JP.csv
 create mode 100644 bluetooth/bluetooth_power_limits_L10_US.csv

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..8d21a33 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 += \
+	$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_L10_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
+	$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_L10_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
+	$(LOCAL_PATH)/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

From 4cf2cbd78f862e65e627133fd4a5950197f57789 Mon Sep 17 00:00:00 2001
From: Cheney Ni <cheneyni@google.com>
Date: Tue, 26 Jul 2022 20:44:33 +0800
Subject: [PATCH 4/4] Bluetooth: Fix broken builds by no such file

Using full path name instead of $(LOCAL_PATH)

Bug: 240249614
Test: Build Pass
Change-Id: I83c9ceb2c628b9f7a28315c7c2af3a1e26232565
---
 bluetooth/qti_default.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
index 8d21a33..a6abd5c 100644
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -71,9 +71,9 @@ PRODUCT_PACKAGES += \
 
 # Bluetooth SAR Tx power caps
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_L10_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
-	$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_L10_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \
-	$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_L10_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv
+	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)