From 809d8598b265fa9d4dcbb0d1553a7ea65891f0b1 Mon Sep 17 00:00:00 2001
From: Lais Andrade <lsandrade@google.com>
Date: Mon, 7 Mar 2022 22:49:17 +0000
Subject: [PATCH 1/3] Revert notification patterns to default pre-S ones [DO
 NOT MERGE]

Bug: 210535717
Test: manual
Change-Id: I6ead011f1cc28ea0c061941ab1665ed8250c3784
(cherry picked from commit ba9024c7802357ae2da0b6ae6a9d889544611f03)
Merged-In: I6ead011f1cc28ea0c061941ab1665ed8250c3784
---
 .../base/core/res/res/values/config.xml       | 82 -------------------
 .../base/core/res/res/values/config.xml       | 82 -------------------
 2 files changed, 164 deletions(-)

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index cf57ec0..f2bc440 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -227,88 +227,6 @@
          non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
     <integer name="config_vibrationWaveformRampDownDuration">50</integer>
 
-    <!-- A vibration waveform for notifications that specify DEFAULT_VIBRATE.
-         This value is a float array with values grouped as
-         { targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) }
-         This is only applied on devices with vibration frequency control. If the device doesn't
-         support frequency control, then the vibration specified in
-         config_defaultNotificationVibePattern is used instead.
-     -->
-    <array name="config_defaultNotificationVibeWaveform">
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>0.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>100.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>100.0</item>
-    </array>
-
-    <!-- A vibration waveform for notifications that do not specify vibration but vibrate anyway,
-         because the device is in vibrate mode. This value is a float array with values grouped as
-         { targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) }
-         This is only applied on devices with vibration frequency control. If the device doesn't
-         support frequency control, then the vibration specified in
-         config_notificationFallbackVibePattern is used instead.
-     -->
-    <array name="config_notificationFallbackVibeWaveform">
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>0.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>50.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>50.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>100.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>50.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>50.0</item>
-    </array>
-
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>
 </resources>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 491a4cc..7da850b 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -195,88 +195,6 @@
          non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
     <integer name="config_vibrationWaveformRampDownDuration">50</integer>
 
-    <!-- A vibration waveform for notifications that specify DEFAULT_VIBRATE.
-         This value is a float array with values grouped as
-         { targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) }
-         This is only applied on devices with vibration frequency control. If the device doesn't
-         support frequency control, then the vibration specified in
-         config_defaultNotificationVibePattern is used instead.
-     -->
-    <array name="config_defaultNotificationVibeWaveform">
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>0.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>100.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>100.0</item>
-    </array>
-
-    <!-- A vibration waveform for notifications that do not specify vibration but vibrate anyway,
-         because the device is in vibrate mode. This value is a float array with values grouped as
-         { targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) }
-         This is only applied on devices with vibration frequency control. If the device doesn't
-         support frequency control, then the vibration specified in
-         config_notificationFallbackVibePattern is used instead.
-     -->
-    <array name="config_notificationFallbackVibeWaveform">
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>0.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>50.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>50.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>100.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>50.0</item>
-
-        <item>0.4</item>
-        <item>-0.25</item>
-        <item>100.0</item>
-
-        <item>0.0</item>
-        <item>-0.85</item>
-        <item>50.0</item>
-    </array>
-
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->

From 58bc0ec853a144064b77f7a6dd136781a28285e3 Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Tue, 8 Mar 2022 06:12:39 +0000
Subject: [PATCH 2/3] Update raven SVN to 25 Bug:  223313197

Change-Id: If21b8cd2be84e877f7e0a946b63e58df057f17b2
(cherry picked from commit 3f0fcbce02c260857e02c6633f68ffba26d1a003)
Merged-In: If21b8cd2be84e877f7e0a946b63e58df057f17b2
---
 device-raven.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-raven.mk b/device-raven.mk
index 543b740..80dcef0 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -183,7 +183,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=24
+    ro.vendor.build.svn=25
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From 0342d5b8a3db4469613549ff525d48053b5c1a48 Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Tue, 8 Mar 2022 06:12:14 +0000
Subject: [PATCH 3/3] Update oriole SVN to 25 Bug:  223313197

Change-Id: Iff092322df7a366281dcf89d8c9987064b6347f8
(cherry picked from commit 6414ff31c8a37eb4e6c55db26ac72588b5abc216)
Merged-In: Iff092322df7a366281dcf89d8c9987064b6347f8
---
 device-oriole.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 5120dc5..cf05364 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=24
+    ro.vendor.build.svn=25
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \