From 6c4358f966e78f4d33e36794f8eb9ca36d9fd8b2 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 3 Dec 2021 22:35:33 +0800
Subject: [PATCH 1/7] Update SVN to 14 for O6R4 Jan MPR 2022

Bug: 208388283
Change-Id: I7009fdb1a5c034700e2c0546c4b79c998033c943
---
 device-oriole.mk | 2 +-
 device-raven.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 0756f61..7a106bd 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -144,7 +144,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=13
+    ro.vendor.build.svn=14
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 34841fb..5b9feb8 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -145,7 +145,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=13
+    ro.vendor.build.svn=14
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From 6970a1c68cc8474548a53e4028a586f0bec7e427 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 3 Dec 2021 22:35:56 +0800
Subject: [PATCH 2/7] Update SVN to 15 for O6R4 Jan MPR 2022

Bug: 208388283
Change-Id: Ied743734f8692a5de48465d66c3e8717588519e0
---
 device-oriole.mk | 2 +-
 device-raven.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 7a106bd..14ba324 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -144,7 +144,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=14
+    ro.vendor.build.svn=15
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 5b9feb8..0c9c169 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -145,7 +145,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=14
+    ro.vendor.build.svn=15
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From 1c099b53437ad77a7869dd0a211f7de1fb677748 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 3 Dec 2021 22:36:12 +0800
Subject: [PATCH 3/7] Update SVN to 16 for O6R4 Jan MPR 2022

Bug: 208388283
Change-Id: I09ab2801655764a816914f553bcfa6456c86f736
---
 device-oriole.mk | 2 +-
 device-raven.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 14ba324..4e50e40 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -144,7 +144,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=15
+    ro.vendor.build.svn=16
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 0c9c169..9824d6f 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -145,7 +145,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=15
+    ro.vendor.build.svn=16
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From c4f2e1f8bea3c0778399443e5a03e7d25bd6fdc3 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 3 Dec 2021 22:36:32 +0800
Subject: [PATCH 4/7] Update SVN to 17 for O6R4 Feb MPR 2022

Bug: 208388283
Change-Id: Ia5caead5c49e7f8ab451276183022d097cf7cb88
---
 device-oriole.mk | 2 +-
 device-raven.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 4e50e40..8510066 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -144,7 +144,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=16
+    ro.vendor.build.svn=17
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 9824d6f..cb8ea01 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -145,7 +145,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=16
+    ro.vendor.build.svn=17
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From e698ad5ebf1131ac1d7661a9f6fc283c50373e12 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 3 Dec 2021 22:36:51 +0800
Subject: [PATCH 5/7] Update SVN to 18 for O6R4 Feb MPR 2022

Bug: 208388283
Change-Id: I81a32df8a136222a20d3e880d723dc09e1f6a563
---
 device-oriole.mk | 2 +-
 device-raven.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 8510066..f199321 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -144,7 +144,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=17
+    ro.vendor.build.svn=18
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index cb8ea01..e5d01b5 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -145,7 +145,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=17
+    ro.vendor.build.svn=18
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From b43a67872fa9b71268a8162cbd343a8f6d2918a5 Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 3 Dec 2021 22:37:11 +0800
Subject: [PATCH 6/7] Update SVN to 19 for O6R4 Feb MPR 2022

Bug: 208388283
Change-Id: Iff5e995440dd90e6d4205707b17760ce955b1631
---
 device-oriole.mk | 2 +-
 device-raven.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index f199321..e50950f 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -144,7 +144,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=18
+    ro.vendor.build.svn=19
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index e5d01b5..c447ca7 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -145,7 +145,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=18
+    ro.vendor.build.svn=19
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From b6a80452dcd1efbe3c9195ca3a929a5b8a7cbe09 Mon Sep 17 00:00:00 2001
From: Vincent Tew <vincenttew@google.com>
Date: Mon, 15 Nov 2021 07:31:15 +0000
Subject: [PATCH 7/7] Revert "Revert "Update: audio tuning table"" [DO NOT
 MERGE]

This reverts commit fa1f5094d1867fe0e69affc0e720f54d93c4473d.

Reason for revert: MBDRC solution merged, revert the tuning back

Bug: 208931002
Change-Id: I431a1a9117d6c10416c0f94b33643480815e583b
(cherry picked from commit 51e7f7fb3b701ad837c1c5837d6f92b5424d9832)
---
 audio/oriole/tuning/bluenote/recording.gatf | Bin 183772 -> 184720 bytes
 audio/oriole/tuning/bluenote/template.xml   |   4 +---
 audio/raven/tuning/bluenote/recording.gatf  | Bin 227712 -> 228660 bytes
 audio/raven/tuning/bluenote/template.xml    |   4 +---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index 2667f0c7d11d5c8f1a9d9bd4606a32153f563ba0..f0160d450742344b3521ac757238b890fcf7d266 100644
GIT binary patch
delta 522
zcmcaJn|s1y?xd2^yyT9HOblhIMR_a?3=E7w3=~W6;bve+ElEsQ0P<JfWcA!{BWfa)
zu_i-FM$@HMIcE98cbtE;?(B;GlWxYHomyGU0aOPD2lx$A5=#<&fclw$0xsO!t8y5v
z7&jMekYL;%Q@}U@Om1SFzOIPTZ2OyZ##c;}lQ_&KZ4KD2qQIoY$hctg{Z-kF3#P}P
zWr`JGU}&&sU~o79p-(tXS5RUS*(kAP^=6fATUL7^yK>>ijn>+;54gRWln{69;Ms3|
zjGH1%S4<X|7Q*&1^M22K6jwH&yK*|vl}VE;*4&_`Ls8tPlUh);=r)h>w1tbfUkO}Z
zdZ&4o(7ZKEg<O)XSXX#+Y(a4!g8*76g4~z4eL@mr3=`ailmwze`;;=q?NiE_Ji-AV
CxT&iE

delta 1041
zcmbQRnETFbZlRLWyyPoqnHb7ai}F|)7#J8CHZSAewOS{Di-94vBr#n9D3&E9(s@90
ziY2#`&f~%Zjq`7M_Ldx39C>4A)8B*FdQ=xpcSvRw;SvDqU;?V<;MyLS%xJ|Zvi<)D
zJ3f1neK8ZZ+AjK-zQ0F(iQVRfj4X`PH>5IF;FjL*kj}V?ak3j*01(fcZji+o03tq3
zzQ!Ifxs1b)k!|up4)e)>IHV>Y;xL=+!x_K{awQuOADLd5z^Fg@!*-7P5+Ij>VSxh!
zgMuRi!v-L}a1i7?Ao~ylg8&dSFwC0S>A=9yU@x-nxE+WFi6OuOr&%*wf%-sZfWQJr
z2>*l=gb!Bl0AzzOFyJ6S5J(9yFz^E@2L~WN0Fp>y*c`Qe*J>~1Q0=<Ge(}7lm1?et
zZ|u4GL9Y+F_AdMFp25a*GgfSCs`HHO)XHKGpk4?NFi1%(NkoM4bYK`KO<&Q*$g@2m
zpD~6Be{f!68N@*q5A-2&P%$t76J<JbP~HFfrXeR|Y3}s?svT1eIG=OnWZk>#);8zF
p&RcU{24=*e1l0k4TtOu;{X#P13EUwy64Pb7Sry}Uvnr;jZ~%*-9L4|u

diff --git a/audio/oriole/tuning/bluenote/template.xml b/audio/oriole/tuning/bluenote/template.xml
index c27188e..52a75ba 100644
--- a/audio/oriole/tuning/bluenote/template.xml
+++ b/audio/oriole/tuning/bluenote/template.xml
@@ -234,8 +234,6 @@
         <param name="attackTime_ms" size="4" type="float"/>
         <param name="releaseTime_ms" size="4" type="float"/>
         <param name="hysteresis" size="4" type="float"/>
-        <param default="0" max="1" min="0" name="rms_manual_enable" type="uint32"/>
-        <param default="0" max="2" min="0" name="rms_channel" type="uint32"/>
       </struct>
       <struct id="17">
         <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
@@ -275,7 +273,7 @@
       <block id="137">
         <moduleRef id="14"/>
         <moduleRef id="7"/>
-        <moduleRef id="32"/>
+        <moduleRef id="8"/>
       </block>
     </signalflow>
     <signalflow id="1000" name="Smart Feature">
diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index dba7c69edbf1b8734dba3f6aeb46d5350fff23b9..61a6f5ea87c794b447d1acadc592f025e961cd2b 100644
GIT binary patch
delta 527
zcmZqp%)8|muV6`OUb0RtGecQwQ638e0|Vpq!ZJqT%{5#LR(thuGccr<B&I6>#n+i$
z)OK%)+2wLyJt}P7y_0`9bzhwqn-;y5Bf8Ib-u5}!sg=bXKy_enfZre`u_Vz4sGkWa
z;KDsUD~B;}<AoTe%?q|qVBCCQmlfmoe}#+}m?j_N2moTg$rCoQO+L5JXuF64lM*B2
zg30<@vl$mmpP$VbE5N|eV9&tdZ~#J|aGEZl#3X{^xFwTX4y0U;;%AKC;o@s2<YM9C
zu%MIw?=%JzNB#fXl768$jzIv;aod58vtop}j3&-Yl-=65hh@`hr<@f#cel>XP3<Y(
z!OhmH^X*z*Wj|x28;bK9u!UXH<`dg8;DHy#LROGXzj2m{XLG}W1*^fV_Lee6AZFU$
JQpWs;2>_u!vJe0O

delta 933
zcmdn;i?`u3uS-d3UUEexGecQwQ638e0|O%v1I5w<xEL5xOA^x+fP85|rETulw$CeU
z*O98T<PFbe{kv)9qG=AsYUwwp^Uhu|`NL`vE&-qhCZJ*tuFZUFPB95@|Np^`&t7C-
z%!IABi$13B?@?be`QWm;NsR5AKdisRGI`Mfv&jl)0yseyumSOr$%-rWCobTqF9C8G
z7#27%Feo@OFl+$g3kN|41KEcd7zBWrfnnCnP6q~t278fp$L&BgNDKiMIL(^b3e*QO
z0|XX0Lii_~AbhZT2Ot}S!9E7jf<P?5z`zHj92|i704OL@HVSTD?S&i|(+=_*oja>?
ze8cYvjqg1!x*X%>vPr+Do*^W2w(o+N-^}dP%3=<nPB3WTH%Lh=NkoLrWWF^?n`a!(
zAP_#A7&o6fp};&;0%@Y4@aCR#3s3`UN6~rhYqyewub;dfBF8Uz_~$IoRL+lGegcoY
z^*5LsnW6*~g8*hg<xLjYaYm%*U7zi@>+AOj#)jK$jy}KtRk5D^#*ZwFlM~ie;7?>t
akVJOjwA2s^$99V<Mj&R|Zc)YjhY0|@9{~6O

diff --git a/audio/raven/tuning/bluenote/template.xml b/audio/raven/tuning/bluenote/template.xml
index c27188e..52a75ba 100644
--- a/audio/raven/tuning/bluenote/template.xml
+++ b/audio/raven/tuning/bluenote/template.xml
@@ -234,8 +234,6 @@
         <param name="attackTime_ms" size="4" type="float"/>
         <param name="releaseTime_ms" size="4" type="float"/>
         <param name="hysteresis" size="4" type="float"/>
-        <param default="0" max="1" min="0" name="rms_manual_enable" type="uint32"/>
-        <param default="0" max="2" min="0" name="rms_channel" type="uint32"/>
       </struct>
       <struct id="17">
         <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
@@ -275,7 +273,7 @@
       <block id="137">
         <moduleRef id="14"/>
         <moduleRef id="7"/>
-        <moduleRef id="32"/>
+        <moduleRef id="8"/>
       </block>
     </signalflow>
     <signalflow id="1000" name="Smart Feature">