summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jakub Pawłowski <jpawlowski@google.com> 2024-03-22 20:20:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-22 20:20:08 +0000
commit8d3fde3fa72fbbf5009092e702359a5e42eccfe0 (patch)
tree25c76f273333f0934a718d3d98ed5392b42756ba
parent3ed90488cb97c55c098000016b83980070eaa7c4 (diff)
parent05a80f21111958cb6d76e29ad07838385e228696 (diff)
Merge "AudioService: Fix volume control during ringtone" into main am: 7696104c13 am: 05a80f2111
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3009286 Change-Id: Iddc6045f9dfb61bcfb56cb4e0b8d786195e4fba5 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.java1
1 files changed, 1 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 0f9517460ee9..649b9efc3282 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -4622,6 +4622,7 @@ public class AudioService extends IAudioService.Stub
case AudioSystem.MODE_CALL_SCREENING:
case AudioSystem.MODE_CALL_REDIRECT:
case AudioSystem.MODE_COMMUNICATION_REDIRECT:
+ case AudioSystem.MODE_RINGTONE:
break;
default:
// no-op is enough for all other values