commit e2204b2b8605d74a4692c7df9e424aefcfe1add7
author Nadav Bar <nadavbar@google.com> Fri Jan 19 20:05:43 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 19 20:05:43 2018 +0000
tree 0658ecda43a84713a6561f1583a977e4a4279f13
parent b53918f67421c7f2ab671fc59fcc2df2237ea14a
parent 7c605f65099f4db2ece707e07b5e844d5eefc9a6

Merge "AudioPolicy: enable phone apps to mute VOICE_CALL stream"

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 68730a5..33f31e0 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -2123,7 +2123,10 @@
                                                   audio_devices_t device)
 {
 
-    if ((index < mVolumeCurves->getVolumeIndexMin(stream)) ||
+    // VOICE_CALL stream has minVolumeIndex > 0  but can be muted directly by an
+    // app that has MODIFY_PHONE_STATE permission.
+    if (((index < mVolumeCurves->getVolumeIndexMin(stream)) &&
+            !(stream == AUDIO_STREAM_VOICE_CALL && index == 0)) ||
             (index > mVolumeCurves->getVolumeIndexMax(stream))) {
         return BAD_VALUE;
     }