From b9e91e66d48c9c1f20b40f7cc29c70efed82b4a4 Mon Sep 17 00:00:00 2001
From: Anoush Khazeni <akhazeni@google.com>
Date: Fri, 14 Apr 2023 11:20:29 -0700
Subject: [PATCH] [T6pro] Updating the volume table for the assistant.

Updating the volume table for the assistant stream.
Also adding a property override for the miniumum
volume setting for the assistant.

Bug: 277829235
Test: Build only
Change-Id: Ia2bd51f7a5cac528f84f0e081f411b0f5b220f19
---
 audio/tangorpro/config/audio_policy_volumes.xml | 8 ++++----
 device-tangorpro.mk                             | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/audio/tangorpro/config/audio_policy_volumes.xml b/audio/tangorpro/config/audio_policy_volumes.xml
index 5dc0d0c..6d71ef2 100644
--- a/audio/tangorpro/config/audio_policy_volumes.xml
+++ b/audio/tangorpro/config/audio_policy_volumes.xml
@@ -193,10 +193,10 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                 ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4300</point>
-        <point>20,-4200</point>
-        <point>60,-3000</point>
-        <point>100,-1200</point>
+        <point>0,-4700</point>
+        <point>20,-3800</point>
+        <point>60,-2400</point>
+        <point>100,-800</point>
     </volume>
     <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                 ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index f0bb9eb..91845eb 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -151,6 +151,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot
 PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=false
 
+# Assistant minimum volume
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.config.assistant_vol_min=1
+
 # Temporary override to synchronise changes in pa/ and ag/. See b/246793311 for context.
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.primary_display_orientation=ORIENTATION_0
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.ignore_hwc_physical_display_orientation=true