commit b9ce5403f132a5a17243f5e184f716877560101f
author Eric Laurent <elaurent@google.com> Thu Dec 07 12:20:33 2017 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Fri Dec 08 03:59:53 2017 +0000
tree d4a01bdc59c0eb3567f6607f8629c42cacfb1eb9
parent 3e24fc000c4625cdcdf48beec35e7dc44ca3e2d9

Revert "audio policy: fix regression in A2DP playback"

Bug: 70319466

This reverts commit 995ba712ed77e36129485f5ac811cf328d0a27f6.
(cherry picked from commit 460451e5d7b9813926fe8fc17283e77b63adaee7)

Change-Id: I22fe069b6738e31d71c9e717e1b56c390ce0e78b

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 46168a4..737872d 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp
@@ -249,9 +249,6 @@
         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 f6ee1c3..be5a1c1 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
@@ -462,9 +462,6 @@
 
         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;
     }