commit 066ad15a44ee714d5610ea23b63e2c3632215e3b
author Xin Li <delphij@google.com> Fri Feb 11 06:17:35 2022 +0000
committer Xin Li <delphij@google.com> Fri Feb 11 06:17:35 2022 +0000
tree d450324808ea41c5c48f0578424710b9c5addf14
parent a7d0f035255a32364e42026615329f8b5bc3514e
parent 30e835898d2d8c46a0cd8d9b3b4f5bb675073a0c

Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I4b0b869fe194285710baefe500d75254d7e7fbaa
Change-Id: Iffc366426f20b8c65cf5a39c6c3d20771dc31729

vts/performance/Benchmark.cpp

diff --git a/vts/performance/Benchmark.cpp b/vts/performance/Benchmark.cpp
index f995ec7..87185f5 100644
--- a/vts/performance/Benchmark.cpp
+++ b/vts/performance/Benchmark.cpp
@@ -82,7 +82,6 @@
 }
 
 static void BM_sendVec_passthrough(benchmark::State& state) {
-    // getService automatically retries
     sp<IBenchmark> service = IBenchmark::getService(gServiceName, true /* getStub */);
     if (service == nullptr) {
         state.SkipWithError("Failed to retrieve benchmark service.");
@@ -94,7 +93,7 @@
 }
 
 static void BM_sendVec_binderize(benchmark::State& state) {
-    // getService automatically retries
+    android::hardware::details::waitForHwService(IBenchmark::descriptor, gServiceName);
     sp<IBenchmark> service = IBenchmark::getService(gServiceName);
     if (service == nullptr) {
         state.SkipWithError("Failed to retrieve benchmark service.");