commit 5334fc896bda921830e8e4d3ae839ecb12dd5961
author Eric Laurent <elaurent@google.com> Tue Dec 05 18:45:46 2017 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Thu Dec 07 00:55:16 2017 +0000
tree 71124a7cc06dcbe38971b3a6706ae4ac39663287
parent a7637ed635c8679129a6e2fbb81ac543a47659fa

audio policy: fix regression in A2DP playback

commit f05fc906 introduced a regression preventing playback over A2DP
to resume after the second time an A2DP device is connected.

Bug: 70245910
Test: Audio smoke test, CTS test for AudioTrack.
Change-Id: Ic6b5da96debf62be08ae12efec27ad36854fe3c5
(cherry picked from commit 995ba712ed77e36129485f5ac811cf328d0a27f6)

services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp

diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp
index 737872d..46168a4 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp
@@ -249,6 +249,9 @@
         mClientInterface->closeInput(mIoHandle);
         LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",
                             __FUNCTION__, mProfile->curOpenCount);
+        if (isActive()) {
+            mProfile->curActiveCount--;
+        }
         mProfile->curOpenCount--;
         mIoHandle = AUDIO_IO_HANDLE_NONE;
     }

services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp

diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
index be5a1c1..f6ee1c3 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
@@ -462,6 +462,9 @@
 
         LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",
                             __FUNCTION__, mProfile->curOpenCount);
+        if (isActive()) {
+            mProfile->curActiveCount--;
+        }
         mProfile->curOpenCount--;
         mIoHandle = AUDIO_IO_HANDLE_NONE;
     }