diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 0ef5bb8..2e2f533 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5649,7 +5649,7 @@
         status_t status = NO_ERROR;
         if (recordTrack->isExternalTrack()) {
             mLock.unlock();
-            status = AudioSystem::startInput(mId);
+            status = AudioSystem::startInput(mId, (audio_session_t)recordTrack->sessionId());
             mLock.lock();
             // FIXME should verify that recordTrack is still in mActiveTracks
             if (status != NO_ERROR) {
@@ -5684,7 +5684,7 @@
 
 startError:
     if (recordTrack->isExternalTrack()) {
-        AudioSystem::stopInput(mId);
+        AudioSystem::stopInput(mId, (audio_session_t)recordTrack->sessionId());
     }
     recordTrack->clearSyncStartEvent();
     // FIXME I wonder why we do not reset the state here?
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index e81697f..48093da 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -2050,7 +2050,7 @@
     if (thread != 0) {
         RecordThread *recordThread = (RecordThread *)thread.get();
         if (recordThread->stop(this) && isExternalTrack()) {
-            AudioSystem::stopInput(recordThread->id());
+            AudioSystem::stopInput(recordThread->id(), (audio_session_t)mSessionId);
         }
     }
 }
@@ -2064,9 +2064,9 @@
         if (thread != 0) {
             if (isExternalTrack()) {
                 if (mState == ACTIVE || mState == RESUMING) {
-                    AudioSystem::stopInput(thread->id());
+                    AudioSystem::stopInput(thread->id(), (audio_session_t)mSessionId);
                 }
-                AudioSystem::releaseInput(thread->id());
+                AudioSystem::releaseInput(thread->id(), (audio_session_t)mSessionId);
             }
             Mutex::Autolock _l(thread->mLock);
             RecordThread *recordThread = (RecordThread *) thread.get();
