commit caf17e316c7b7c22e877397f6bb3f882e4f68279
author Eric Laurent <elaurent@google.com> Sat Dec 20 00:33:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 20 00:33:03 2014 +0000
tree 51b2a1fa1c4650e77eb07d7448c2b0da3906e07b
parent 4af263bd15a8177f1e28a53a2765277022d7372e
parent 0a0662ea48b060716e0e982661836df9a0958111

am 0a0662ea: Merge "audio policy: improve accessibility routing" into lmp-mr1-dev

* commit '0a0662ea48b060716e0e982661836df9a0958111':
  audio policy: improve accessibility routing

services/audiopolicy/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp
index a3389e0..be7158f 100644
--- a/services/audiopolicy/AudioPolicyManager.cpp
+++ b/services/audiopolicy/AudioPolicyManager.cpp
@@ -596,6 +596,9 @@
             }
             handleIncallSonification((audio_stream_type_t)stream, false, true);
         }
+
+        // force reevaluating accessibility routing when call starts
+        mpClientInterface->invalidateStream(AUDIO_STREAM_ACCESSIBILITY);
     }
 
     // store previous phone state for management of sonification strategy below
@@ -1290,6 +1293,11 @@
                         outputDesc->mPolicyMix->mRegistrationId);
         }
 
+        // force reevaluating accessibility routing when ringtone or alarm starts
+        if (strategy == STRATEGY_SONIFICATION) {
+            mpClientInterface->invalidateStream(AUDIO_STREAM_ACCESSIBILITY);
+        }
+
         if (waitMs > muteWaitMs) {
             usleep((waitMs - muteWaitMs) * 2 * 1000);
         }