From f9c8cd244b60bdceed6510c8107284196b2a2be6 Mon Sep 17 00:00:00 2001
From: Yung Ti Su <andysu@google.com>
Date: Thu, 31 Aug 2023 10:22:13 +0000
Subject: [PATCH 1/2] add mixer path for BT SCO voice call

Bug: 297794937
Test: manual

Change-Id: Ied5cd99dbab9a29a8abe2b7fd35c2e19dc35aba0
Signed-off-by: Yung Ti Su <andysu@google.com>
---
 audio/husky/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++
 audio/shiba/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index 9cb0f97..4ca5e58 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -936,6 +936,18 @@
     <ctl name="BT_RX Mixer EP5" value="1" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-sco-default">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> bluetooth-sco-headset">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> bluetooth-sco-car-kit">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index 9cb0f97..4ca5e58 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -936,6 +936,18 @@
     <ctl name="BT_RX Mixer EP5" value="1" />
   </path>
 
+  <path name="voice-call-downlink-0 -> bluetooth-sco-default">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> bluetooth-sco-headset">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> bluetooth-sco-car-kit">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
   <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>

From 1a082f01a9f2b8527bbe9a1ab813cf27b1ed674a Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Fri, 1 Sep 2023 00:38:09 +0000
Subject: [PATCH 2/2] Disable limiting camera_hal for LAUNCH hint

If auto rotation is enabled, it will trigger LAUNCH hint while
camera is running if device rotates, which could limit camera_hal
tasks to little cores. So, disable it first until there is a new
hint for the rotation event.

Bug: 297273578
Test: build pass
Change-Id: If472e2410e40f09372250e20dd7e23d315c5a576
---
 perf/powerhint-husky.json      | 24 ------------------------
 perf/powerhint-ripcurrent.json | 24 ------------------------
 perf/powerhint-shiba.json      | 24 ------------------------
 3 files changed, 72 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 5e6f67a..9c110c4 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -892,30 +892,6 @@
       "Type": "DoHint",
       "Value": "LAUNCH_PMU"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDCPUSET_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDHIGHCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
-    },
     {
       "PowerHint": "LAUNCH",
       "Type": "DoHint",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 4118b77..442aac9 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -852,30 +852,6 @@
       "Type": "DoHint",
       "Value": "LAUNCH_PMU"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDCPUSET_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDHIGHCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
-    },
     {
       "PowerHint": "LAUNCH",
       "Type": "DoHint",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 5a97694..6ae99e1 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -892,30 +892,6 @@
       "Type": "DoHint",
       "Value": "LAUNCH_PMU"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDCPUSET_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDHIGHCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
-    },
     {
       "PowerHint": "LAUNCH",
       "Type": "DoHint",