From c2e3b8b3bfad17ee02789345f319350c2bdaf443 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Thu, 6 Oct 2022 12:55:30 -0700
Subject: [PATCH 1/3] [LSC] Add LOCAL_LICENSE_KINDS

Added SPDX-license-identifier-Apache-2.0 to:
  cast_auth/mediadrm/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I315045a219b512bf57b16433570d1018816608c0
---
 cast_auth/mediadrm/Android.bp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cast_auth/mediadrm/Android.bp b/cast_auth/mediadrm/Android.bp
index 5c098ba..1dc4e32 100644
--- a/cast_auth/mediadrm/Android.bp
+++ b/cast_auth/mediadrm/Android.bp
@@ -2,6 +2,15 @@
 // ----------------------------------------------------------------------------
 // Builds android.hardware.drm-service.castkey
 //
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_google_tangorpro_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["device_google_tangorpro_license"],
+}
+
 cc_binary {
     name: "android.hardware.drm-service.castkey",
     defaults: ["castkey_service_defaults"],
@@ -36,4 +45,4 @@ cc_defaults {
         "liblog",
         "libutils",
     ],
-}
\ No newline at end of file
+}

From fc75279aad916fb1259a3e70b5bf1866d8f91913 Mon Sep 17 00:00:00 2001
From: Chungkai Mei <chungkai@google.com>
Date: Fri, 30 Sep 2022 07:41:42 +0000
Subject: [PATCH 2/3] Update camera and face unlock related powerhint

Boost big cpu cluster when face unlock and relax
CPU minimum frequency boost for LAUNCH_CAMERA

Bug: 248960565
Change-Id: I075b7f4447327be4ef601c531b43473f79dbc74a
---
 powerhint.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/powerhint.json b/powerhint.json
index cfe3ccc..20e4a8f 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -1814,6 +1814,12 @@
       "Duration": 0,
       "Value": "0,1,2,3"
     },
+    {
+      "PowerHint": "FACE_UNLOCK_BOOST",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 1000,
+      "Value": "9999999"
+    },
     {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_LITTLE_TSKIN_BYPASS",

From 5a293d9cd4299752d6e8677a2435009168e9d32f Mon Sep 17 00:00:00 2001
From: yixuanjiang <yixuanjiang@google.com>
Date: Fri, 7 Oct 2022 17:06:12 +0800
Subject: [PATCH 3/3] audio: update ultrasonic capture setting

correct mic setting

Test: local
Bug: 237471423
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
Change-Id: I0f1996e3c2834e2d75c51aafeb9a4a5ddf02aa2a
---
 audio/tangorpro/config/mixer_paths.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/tangorpro/config/mixer_paths.xml b/audio/tangorpro/config/mixer_paths.xml
index 88fee50..504eecc 100644
--- a/audio/tangorpro/config/mixer_paths.xml
+++ b/audio/tangorpro/config/mixer_paths.xml
@@ -889,7 +889,7 @@
 
     <path name="ultrasound-mic">
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0"/>
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="1"/>
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="3"/>
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
     </path>