commit 24bf51ae92285202bdbe3fa00c7c83e93c5a03e2
author Andy Hung <hunga@google.com> Tue Oct 09 19:34:53 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 09 19:34:53 2018 +0000
tree a5a5b4eb56e7edefcb3ffc1c6742f2e6f1c16404
parent 72b9ee114d4b5b0017578afe826e8431f0362f96
parent 9baf44fbba5b0e794cb9f2cbe0c7cbe154b27e98

Merge "AudioPolicyManager: Abort on input descriptor inconsistency"

services/audiopolicy/common/managerdefinitions/include/ClientDescriptor.h

diff --git a/services/audiopolicy/common/managerdefinitions/include/ClientDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/ClientDescriptor.h
index 68f38dd..030bf4b 100644
--- a/services/audiopolicy/common/managerdefinitions/include/ClientDescriptor.h
+++ b/services/audiopolicy/common/managerdefinitions/include/ClientDescriptor.h
@@ -180,8 +180,12 @@
         return it->second;
     }
     virtual void removeClient(audio_port_handle_t portId) {
-        LOG_ALWAYS_FATAL_IF(mClients.erase(portId) == 0,
+        auto it = mClients.find(portId);
+        LOG_ALWAYS_FATAL_IF(it == mClients.end(),
                 "%s(%d): client does not exist", __func__, portId);
+        LOG_ALWAYS_FATAL_IF(it->second->active(),
+                "%s(%d): removing client still active!", __func__, portId);
+        (void)mClients.erase(it);
     }
     size_t getClientCount() const {
         return mClients.size();

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 38ad189..1f29874 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp
@@ -257,6 +257,9 @@
             mProfile->curActiveCount--;
         }
         mProfile->curOpenCount--;
+        LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount <  mProfile->curActiveCount,
+                "%s(%d): mProfile->curOpenCount %d < mProfile->curActiveCount %d.",
+                __func__, mId, mProfile->curOpenCount, mProfile->curActiveCount);
         mIoHandle = AUDIO_IO_HANDLE_NONE;
     }
 }
@@ -272,8 +275,9 @@
     // Handle non-client-specific activity ref count
     int32_t oldGlobalActiveCount = mGlobalActiveCount;
     if (!active && mGlobalActiveCount < 1) {
-        ALOGW("%s invalid deactivation with globalRefCount %d", __FUNCTION__, mGlobalActiveCount);
-        mGlobalActiveCount = 1;
+        LOG_ALWAYS_FATAL("%s(%d) invalid deactivation with globalActiveCount %d",
+               __func__, client->portId(), mGlobalActiveCount);
+        // mGlobalActiveCount = 1;
     }
     const int delta = active ? 1 : -1;
     mGlobalActiveCount += delta;