From 48a8251b5ad6df53597ddc985f716977449c4dd1 Mon Sep 17 00:00:00 2001
From: Patty Huang <plhuang@google.com>
Date: Tue, 27 Sep 2022 17:58:53 +0800
Subject: [PATCH 1/2] Apply the workaround for the CIS->SCO handover

Set the system property persist.bluetooth.leaudio.notify.idle.during.call
to true to receive the notification when LeAudio group turned idle

Bug: 244524929
Bug: 244391698
Test: Switch LE Audio device to HFP device during phone call, and make sure the HFP device can hear sound.
Change-Id: I0a0ad4ef97e61deb528c6f8180317bda8b2512be
---
 bluetooth/qti_default.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
index 8e6b92a..5c33b60 100644
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -36,6 +36,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	persist.bluetooth.leaudio_offload.disabled=false \
 	ro.vendor.audio_hal.ble_use_stream_id=true
 
+# Bluetooth LE Audio CIS handover to SCO
+# Set the property only if the controller doesn't support CIS and SCO
+# simultaneously. More details in b/242908683.
+PRODUCT_PRODUCT_PROPERTIES += \
+	persist.bluetooth.leaudio.notify.idle.during.call=true
+
 # LE Auido Offload Capabilities setting
 PRODUCT_COPY_FILES += \
 	device/google/lynx/bluetooth/lynx/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml

From 9342bb887b3d39a61967ea4aec3e8b10d6ef227f Mon Sep 17 00:00:00 2001
From: Shanmuga Pandi M <shanmugapandi@google.com>
Date: Fri, 23 Sep 2022 08:18:07 +0000
Subject: [PATCH 2/2] [L10] Relax CPU minimum frequency boost for LAUNCH_CAMERA

Bug: 248960565
Test: CTS testCameraLaunch, GCA
Change-Id: I075b7f4447327be4ef601c531b43473f79dbc74a
---
 powerhint.json | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index 8b7b688..3a1fef8 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -41,6 +41,7 @@
       "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
+        "1401000",
         "1197000",
         "0"
       ],
@@ -68,6 +69,7 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
+        "1836000",
         "1197000",
         "0"
       ],
@@ -95,6 +97,7 @@
       "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
+        "1826000",
         "1106000",
         "0"
       ],
@@ -151,6 +154,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "CAMUClampBoost",
+      "Path": "/proc/vendor_sched/cam_uclamp_min",
+      "Values": [
+        "612",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "TAUClampBoost",
       "Path": "/proc/vendor_sched/ta_uclamp_min",
@@ -576,7 +588,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 1000,
-      "Value": "9999999"
+      "Value": "1826000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -588,7 +600,7 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUMidClusterMinFreq",
       "Duration": 1000,
-      "Value": "9999999"
+      "Value": "1836000"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",
@@ -600,7 +612,13 @@
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPULittleClusterMinFreq",
       "Duration": 1000,
-      "Value": "9999999"
+      "Value": "1401000"
+    },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "CAMUClampBoost",
+      "Duration": 1000,
+      "Value": "612"
     },
     {
       "PowerHint": "CAMERA_LAUNCH",