summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anoush Khazeni <akhazeni@google.com> 2023-05-22 19:24:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-22 19:24:33 +0000
commit73162ef1cab2f3380e3968f494fab3e5b9ce9a3f (patch)
treebac23ab8d71faf4330f6535a38ea3ce94e8dc33f
parentb9bfa52e4246f21bec6c343c0e1bf00e8ce1c918 (diff)
parent136d6e1f512dcf8ce6706ad5519eb79066d56ab0 (diff)
Merge "Incorporating property setting for the minimum volume limit for Assistant." into udc-dev am: a7ba7d7fbe am: 136d6e1f51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23175039 Change-Id: If1e8fb3999169aeeec1fe94874de1b49c60ff634 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index bb04c35c46a2..d0b6cdce037f 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1145,6 +1145,11 @@ public class AudioService extends IAudioService.Stub
MAX_STREAM_VOLUME[AudioSystem.STREAM_SYSTEM];
}
+ int minAssistantVolume = SystemProperties.getInt("ro.config.assistant_vol_min", -1);
+ if (minAssistantVolume != -1) {
+ MIN_STREAM_VOLUME[AudioSystem.STREAM_ASSISTANT] = minAssistantVolume;
+ }
+
// Read following properties to configure max volume (number of steps) and default volume
// for STREAM_NOTIFICATION and STREAM_RING:
// config_audio_notif_vol_default