commit 4dc680607181e6a76f4e91a39366c4f5dfb7b03e
author Eric Laurent <elaurent@google.com> Mon Jul 28 17:26:49 2014 -0700
committer Eric Laurent <elaurent@google.com> Mon Jul 28 18:10:29 2014 -0700
tree 5212b6ff474b8ef68a68cb1cf144f54e5348de77
parent d530d415e60373caf875a37d2d747a51470ee45c

audio policy: pass session ID to capture activity methods

Indicate the audio session ID when calling getInput(),
startInput(), stopInput(), releaseInput().

Bug: 12378680.
Change-Id: I763793752f93e2f4e1445a5ab217c895af011038

services/audiopolicy/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
index 4a55bec..75745b3 100644
--- a/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
@@ -232,8 +232,8 @@
     Mutex::Autolock _l(mLock);
     // the audio_in_acoustics_t parameter is ignored by get_input()
     audio_io_handle_t input = mAudioPolicyManager->getInput(inputSource, samplingRate,
-                                                   format, channelMask, (audio_in_acoustics_t) 0,
-                                                   flags);
+                                                   format, channelMask,
+                                                   (audio_session_t)audioSession, flags);
 
     if (input == 0) {
         return input;
@@ -248,33 +248,36 @@
     return input;
 }
 
-status_t AudioPolicyService::startInput(audio_io_handle_t input)
+status_t AudioPolicyService::startInput(audio_io_handle_t input,
+                                        audio_session_t session)
 {
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }
     Mutex::Autolock _l(mLock);
 
-    return mAudioPolicyManager->startInput(input);
+    return mAudioPolicyManager->startInput(input, session);
 }
 
-status_t AudioPolicyService::stopInput(audio_io_handle_t input)
+status_t AudioPolicyService::stopInput(audio_io_handle_t input,
+                                       audio_session_t session)
 {
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }
     Mutex::Autolock _l(mLock);
 
-    return mAudioPolicyManager->stopInput(input);
+    return mAudioPolicyManager->stopInput(input, session);
 }
 
-void AudioPolicyService::releaseInput(audio_io_handle_t input)
+void AudioPolicyService::releaseInput(audio_io_handle_t input,
+                                      audio_session_t session)
 {
     if (mAudioPolicyManager == NULL) {
         return;
     }
     Mutex::Autolock _l(mLock);
-    mAudioPolicyManager->releaseInput(input);
+    mAudioPolicyManager->releaseInput(input, session);
 
     // release audio processors from the input
     status_t status = mAudioPolicyEffects->releaseInputEffects(input);