commit 20baac2a934e9d968832a44809eecc8c46c17fe2
author Jean-Michel Trivi <jmtrivi@google.com> Wed Sep 16 16:15:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 16 16:15:43 2015 +0000
tree a995ab9b1460c638f9702fcef9309399de192ed7
parent da56cd3d6e0b492d1665ff3a36cd1d1e15613baa
parent af20bc26704458eac0ddc23f12b637939b0df7a4

Merge "AudioPolicy: don't always change ACCESSIBILITY volume" into mnc-dr-dev

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index b1d7b13..dfb477d 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1718,7 +1718,9 @@
                 status = volStatus;
             }
         }
-        if ((device == AUDIO_DEVICE_OUT_DEFAULT) || ((curDevice & accessibilityDevice) != 0)) {
+        if ((accessibilityDevice != AUDIO_DEVICE_NONE) &&
+                ((device == AUDIO_DEVICE_OUT_DEFAULT) || ((curDevice & accessibilityDevice) != 0)))
+        {
             status_t volStatus = checkAndSetVolume(AUDIO_STREAM_ACCESSIBILITY,
                                                    index, desc, curDevice);
         }