commit 9169294539ad46e08e2fe76a93c37ed965c13058
author Phil Burk <philburk@google.com> Fri Jun 30 12:23:05 2017 -0700
committer Phil Burk <philburk@google.com> Sat Jul 01 08:01:51 2017 -0700
tree 7f99790dd7625f12d19a1365666e4c541451f0ae
parent 6ec18f8ce3d797fdd5722926ac17c1f4eda7904d

aaudio: limit number of streams per process

Testing the new max streams restriction revealed the bug
involving the second shared stream.

Bug: 62951298
Bug: 63171495
Test: test_n_streams.cpp can open MAX_STREAMS_PER_PROCESS MMAP streams
Change-Id: Ibea7d9c4716326a37c669954b52f397ed2968caa

services/oboeservice/AAudioEndpointManager.cpp

diff --git a/services/oboeservice/AAudioEndpointManager.cpp b/services/oboeservice/AAudioEndpointManager.cpp
index d8b9101..36e678a 100644
--- a/services/oboeservice/AAudioEndpointManager.cpp
+++ b/services/oboeservice/AAudioEndpointManager.cpp
@@ -115,24 +115,24 @@
             default:
                 break;
         }
-    }
 
-    if (endpoint != nullptr) {
-        aaudio_result_t result = endpoint->open(configuration);
-        if (result != AAUDIO_OK) {
-            ALOGE("AAudioEndpointManager::findEndpoint(), open failed");
-            delete endpoint;
-            endpoint = nullptr;
-        } else {
-            switch(direction) {
-                case AAUDIO_DIRECTION_INPUT:
-                    mInputs.push_back(capture);
-                    break;
-                case AAUDIO_DIRECTION_OUTPUT:
-                    mOutputs.push_back(player);
-                    break;
-                default:
-                    break;
+        if (endpoint != nullptr) {
+            aaudio_result_t result = endpoint->open(configuration);
+            if (result != AAUDIO_OK) {
+                ALOGE("AAudioEndpointManager::findEndpoint(), open failed");
+                delete endpoint;
+                endpoint = nullptr;
+            } else {
+                switch(direction) {
+                    case AAUDIO_DIRECTION_INPUT:
+                        mInputs.push_back(capture);
+                        break;
+                    case AAUDIO_DIRECTION_OUTPUT:
+                        mOutputs.push_back(player);
+                        break;
+                    default:
+                        break;
+                }
             }
         }
         ALOGD("AAudioEndpointManager::openEndpoint(), created %p for device = %d, dir = %d",