commit 67a74f49c5e5b40d5ff511169cbdd5c9f7ae5205
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Apr 28 10:59:55 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 28 10:59:55 2023 +0000
tree 5fc9bb6de23a8a7f35b0f42112f1ddc4fe592d84
parent bc9f2a6cb195d9fd16c0d180c5077b63595d1c79
parent 3d0d3e99c0335b94fa41fafce6d0fb3fedb07f75

Merge "opengl: fix resource leak when dlsym failed"

libs/binder/IServiceManager.cpp

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index d4ef0b7..2408307 100644
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -412,11 +412,13 @@
             // command, so we hang indefinitely.
             std::unique_lock<std::mutex> lock(waiter->mMutex);
             using std::literals::chrono_literals::operator""s;
-            waiter->mCv.wait_for(lock, 2s, [&] { return waiter->mBinder != nullptr; });
+            waiter->mCv.wait_for(lock, 1s, [&] {
+                return waiter->mBinder != nullptr;
+            });
             if (waiter->mBinder != nullptr) return waiter->mBinder;
         }
 
-        ALOGW("Waited two seconds for %s (is service started? Number of threads started in the "
+        ALOGW("Waited one second for %s (is service started? Number of threads started in the "
               "threadpool: %zu. Are binder threads started and available?)",
               name.c_str(), ProcessState::self()->getThreadPoolMaxTotalThreadCount());
 

libs/binder/TEST_MAPPING

diff --git a/libs/binder/TEST_MAPPING b/libs/binder/TEST_MAPPING
index 41707d4..0e8e187 100644
--- a/libs/binder/TEST_MAPPING
+++ b/libs/binder/TEST_MAPPING
@@ -92,12 +92,6 @@
       "name": "binderRpcTest"
     },
     {
-      "name": "CtsRootRollbackManagerHostTestCases"
-    },
-    {
-      "name": "StagedRollbackTest"
-    },
-    {
       "name": "binderRpcTestNoKernel"
     },
     {

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 8d13007..287e077 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -462,7 +462,7 @@
     EXPECT_GE(epochMsAfter, epochMsBefore + 2 * sleepMs);
 
     // Potential flake, but make sure calls are handled in parallel.
-    EXPECT_LE(epochMsAfter, epochMsBefore + 3 * sleepMs);
+    EXPECT_LE(epochMsAfter, epochMsBefore + 4 * sleepMs);
 }
 
 TEST_P(BinderRpc, ThreadPoolOverSaturated) {

libs/binder/trusty/binderRpcTest/manifest.json

diff --git a/libs/binder/trusty/binderRpcTest/manifest.json b/libs/binder/trusty/binderRpcTest/manifest.json
index d8b080f..1cefac5 100644
--- a/libs/binder/trusty/binderRpcTest/manifest.json
+++ b/libs/binder/trusty/binderRpcTest/manifest.json
@@ -1,6 +1,6 @@
 {
     "uuid": "9dbe9fb8-60fd-4bdd-af86-03e95d7ad78b",
     "app_name": "binderRpcTest",
-    "min_heap": 163840,
+    "min_heap": 262144,
     "min_stack": 16384
 }