From 0800e891ec3594c3d5f9ee5a790bbd3c8fde2089 Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Fri, 1 Oct 2021 11:46:53 +0200
Subject: [PATCH 1/4] audio config: fix minimum alarm volume

The ALARM volume curve on SPEAKER device must have a lowest
point with abscisse 0 instead of 1 to prevent the stream from
being muted when lowest UI index is selected.

Bug: 201069348
Test: set alarm volume to min and play alarm
Change-Id: I29dda66002562e9ce889bd4f8b0154c2837f7be5
---
 audio/oriole/config/audio_policy_volumes.xml | 2 +-
 audio/raven/config/audio_policy_volumes.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/audio/oriole/config/audio_policy_volumes.xml b/audio/oriole/config/audio_policy_volumes.xml
index a58e237..003847b 100644
--- a/audio/oriole/config/audio_policy_volumes.xml
+++ b/audio/oriole/config/audio_policy_volumes.xml
@@ -90,7 +90,7 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-3600</point>
+        <point>0,-3600</point>
         <point>33,-2400</point>
         <point>66,-1200</point>
         <point>100,0</point>
diff --git a/audio/raven/config/audio_policy_volumes.xml b/audio/raven/config/audio_policy_volumes.xml
index eae4c9a..9739e88 100644
--- a/audio/raven/config/audio_policy_volumes.xml
+++ b/audio/raven/config/audio_policy_volumes.xml
@@ -94,7 +94,7 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-3600</point>
+        <point>0,-3600</point>
         <point>33,-2400</point>
         <point>66,-1200</point>
         <point>100,0</point>

From 8852d7bceea3f3ef6181115674bf480a69bfcdec Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Fri, 8 Oct 2021 12:02:04 +0800
Subject: [PATCH 2/4] audio: update O6/R4 Aaram volume curve

O6
Change:
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
        <point>0,-4800</point>
R4
Change:
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
        <point>0,-5200</point>

Bug: 201069348
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Ia5f82e06bc272d93172892692c7987993786b754
---
 audio/oriole/config/audio_policy_volumes.xml | 2 +-
 audio/raven/config/audio_policy_volumes.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/audio/oriole/config/audio_policy_volumes.xml b/audio/oriole/config/audio_policy_volumes.xml
index 003847b..1c46cd9 100644
--- a/audio/oriole/config/audio_policy_volumes.xml
+++ b/audio/oriole/config/audio_policy_volumes.xml
@@ -90,7 +90,7 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-3600</point>
+        <point>0,-4800</point>
         <point>33,-2400</point>
         <point>66,-1200</point>
         <point>100,0</point>
diff --git a/audio/raven/config/audio_policy_volumes.xml b/audio/raven/config/audio_policy_volumes.xml
index 9739e88..c81014e 100644
--- a/audio/raven/config/audio_policy_volumes.xml
+++ b/audio/raven/config/audio_policy_volumes.xml
@@ -94,7 +94,7 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-3600</point>
+        <point>0,-5200</point>
         <point>33,-2400</point>
         <point>66,-1200</point>
         <point>100,0</point>

From 941224c8451d391301ffa0fec6b8ab9565b361d0 Mon Sep 17 00:00:00 2001
From: Jia-yi Chen <jychen@google.com>
Date: Mon, 27 Sep 2021 17:53:49 -0700
Subject: [PATCH 3/4] thermal: update thermal config

1) Lower CRITICAL temperature of VIRTUAL-SKIN to 46.5
2) Update the virtual-sensor formula based on latest data

Bug: 201020972
Test: Boot
Change-Id: I5dd45635828932b4561ab1deafe10de66a924dcd
---
 thermal_info_config_oriole.json | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 16e5a16..2c7fdc8 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -205,6 +205,31 @@
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
+        {
+            "Name":"VIRTUAL-QI-QUIET",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":[
+                "qi_therm",
+                "quiet_therm"
+            ],
+            "Coefficient":[
+                "0.25",
+                "0.75"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
         {
             "Name":"VIRTUAL-QI-BATT",
             "Type":"UNKNOWN",
@@ -291,7 +316,7 @@
             "Formula":"MAXIMUM",
             "Combination":[
                 "VIRTUAL-QI-GNSS",
-                "VIRTUAL-QI-BATT",
+                "VIRTUAL-QI-QUIET",
                 "VIRTUAL-USB2-DISP",
                 "VIRTUAL-QUIET-BATT"
             ],
@@ -306,7 +331,7 @@
                 "39.0",
                 "43.0",
                 "45.0",
-                "47.0",
+                "46.5",
                 "52.0",
                 "55.0"
             ],
@@ -315,7 +340,7 @@
                 1.9,
                 1.9,
                 1.9,
-                1.9,
+                1.4,
                 1.9,
                 1.9
             ],
@@ -458,7 +483,7 @@
             "Formula":"MAXIMUM",
             "Combination":[
                 "VIRTUAL-QI-GNSS",
-                "VIRTUAL-QI-BATT",
+                "VIRTUAL-QI-QUIET",
                 "VIRTUAL-USB2-DISP",
                 "VIRTUAL-QUIET-BATT"
             ],

From 65bb51f95fe933957b702b4de1cf2d1a2b5c4bb4 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Fri, 8 Oct 2021 06:27:12 +0000
Subject: [PATCH 4/4] audio: Update tuning table for removing the risk of
 blocking rear microphone in 3rd party recorder use case

Reason:
-Change the microphone assignment from rear mic to top mic since there is a risk that the rear mic will be blocked when users put devices on the desk.

Change list:
Update recording.gatf file for changing microphone assignment in handset_mono_mic usecase

Validation:
3rd party camcorder/recorder and GCA function are good and validation was used SD1A.210817.026 (7772856)

Bug: 202467646
Test: forrest build
Change-Id: I3b0f8a7ba590925fc70f28bdd3bbb4b29938fd68
---
 audio/oriole/tuning/bluenote/recording.gatf | Bin 183772 -> 183772 bytes
 audio/raven/tuning/bluenote/recording.gatf  | Bin 227712 -> 227712 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index 1c9733f7947e17b55e823c88ceb19591db0c39ae..2667f0c7d11d5c8f1a9d9bd4606a32153f563ba0 100644
GIT binary patch
delta 229
zcmcaJoBPge?hR*FPj3ik<Wb0y66rjkImMFON#}9lfyVhaJ$p-zERMV}v+3`_Ydxxq
zrgKOzl}uNNVB}$Bn%<hkczyc^DW(aGAo3K`^mVa}0U%=D^f_@r7LfQf-7X%;x);yr
zH@zl-F<?88h+&*4!L#|sYMyNh_rJbr$jMlmJH5YZ$5aE(=Uh2i_wKs2%{j62)|{7t
d8FAZLk{Bbvrju;Pc7q(oHLJIqC^4;A4FIC6VcY-!

delta 147
zcmV;E0Brx<n+x2V3$V<qvm~|{wjhJ>l2l~SA1#Z`3NC2r*=w~f+q$JaFYU$s`Bf7h
zimSI=YynsSvv9B&0k_O<0YU?pu5tl3x9n#DL<F~pb^)xblgz6OAd{hRs=v)16ayhc
z`0=&vIgy`J-?X%dxoe$GH^zWWhm-iLbO8aAfeaS`0k@H20iOw%h;{)Cw?HBSoU3E)
BLo@&Y

diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index 4c74dcbf7c83b1f6a70337db77ad6e40520183c2..dba7c69edbf1b8734dba3f6aeb46d5350fff23b9 100644
GIT binary patch
delta 161
zcmZqp%-ispcY=z7w4l;9_iNkd6}Ib0)mid}XS4p@v~tlj2V=GLo6~t`uh<@u&m6(H
z{X#Lb1mpG-h0H>1lQ#*OZ5OCuE@0f8!?j`cbe()=9))QK`Hjw<RXM)l_k_mx9v5AX
z@p9RuUsKNzk~!OVLCkOFM3<83XMhSBnWo>&XTFXw&xv{Zs#0dN%{puWEX^9*+BLQ@
KF4x$`v=acEdO%13

delta 151
zcmV;I0BHY!^9_LW4Ui-t_XbP$$eRXtGkebP*wH)vL|agylkxF^V5r(3AOqgulSsC7
z0RfZI78d~lvC$<3m!5I~Hj^v{xR;D`0XVZDy<h{gd<vkem)Ok$41<8chk(EVr+~l$
zxtAa!0tA;JYyk`)@;B*r)mqkOi3^3Lte=!ra#m6`ToRe((YgFBI-SqSu|!w_x1?<W
F&<L2YL}dT~