From e0f6a5cd38c2734b750c82ede33ff912ce272411 Mon Sep 17 00:00:00 2001
From: Martin Liu <liumartin@google.com>
Date: Tue, 5 Oct 2021 12:40:33 +0000
Subject: [PATCH 1/3] zram: add zram size property

Bug: 200899926
Test: check zram swap and backing device
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: Ife748938f5e7cfb34c343a3f568c93824f33e8fe
Merged-In: Ife748938f5e7cfb34c343a3f568c93824f33e8fe
---
 conf/init.raviole.rc | 3 ---
 device-oriole.mk     | 4 ++++
 device-raven.mk      | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index 03baef9..ed55764 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -52,6 +52,3 @@ on post-fs-data
 
 on property:ro.revision=PROTO1.0
     setprop persist.fingerprint.ghbm true
-
-on late-fs
-    setprop vendor.zram.size 3GB
diff --git a/device-oriole.mk b/device-oriole.mk
index 4ffd73d..90ca6f8 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -204,3 +204,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Override default distortion output gain according to UX experiments
 PRODUCT_PRODUCT_PROPERTIES += \
     vendor.audio.hapticgenerator.distortion.output.gain=0.5
+
+# Set zram size
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.zram.size=3g
diff --git a/device-raven.mk b/device-raven.mk
index 4284c3c..8e8ec48 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -210,3 +210,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Override default distortion output gain according to UX experiments
 PRODUCT_PRODUCT_PROPERTIES += \
     vendor.audio.hapticgenerator.distortion.output.gain=0.5
+
+# Set zram size
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.zram.size=3g

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 2/3] 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 3/3] 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>