commit 77881cd0213e2fb5619862cfd5b0aa2b9d4e3081
author Eric Laurent <elaurent@google.com> Fri Feb 09 16:01:31 2018 -0800
committer Eric Laurent <elaurent@google.com> Fri Feb 09 16:09:20 2018 -0800
tree 0920071fb96e57d396b16eaf4166cbb460deb176
parent 7dca8a83b7c6922a69e266aa9f2b5693a4d773a9

fix audio port ID generation for new AudioTrack and AudioRecord

commit 0f4b3c544 introduced a problem in audio port ID generation
by audio policy manager when a new playback or record track
is created: audio flinger was passing a random port ID to
getOutputForAttr and getInputforAttr.
This caused audio policy to confuse several record tracks
and fail to process capture stop properly.

Bug: 72628781
Test: manual camcorder tests

Change-Id: I55e18e2e6ccb9f69c36372d9bf9becf85e7c2614

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 75f22ba..a3ce1f6 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -659,7 +659,7 @@
     sp<Client> client;
     status_t lStatus;
     audio_stream_type_t streamType;
-    audio_port_handle_t portId;
+    audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE;
 
     bool updatePid = (input.clientInfo.clientPid == -1);
     const uid_t callingUid = IPCThreadState::self()->getCallingUid();
@@ -1597,7 +1597,7 @@
     sp<Client> client;
     status_t lStatus;
     audio_session_t sessionId = input.sessionId;
-    audio_port_handle_t portId;
+    audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE;
 
     output.cblk.clear();
     output.buffers.clear();
@@ -1660,6 +1660,7 @@
         recordTrack.clear();
         AudioSystem::releaseInput(portId);
         output.inputId = AUDIO_IO_HANDLE_NONE;
+        portId = AUDIO_PORT_HANDLE_NONE;
     }
     lStatus = AudioSystem::getInputForAttr(&input.attr, &output.inputId,
                                       sessionId,