commit 181c1219d807c3bf70d03b9dcc22c228c79b07ef
author yidong.zhang <yidong.zhang@unisoc.corp-partner.google.com> Fri Sep 21 09:33:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 21 09:33:01 2018 -0700
tree 0e42916faf6cf270f85ef86b56d0613bd832d7cd
parent eddff838c406a3a2fd11daf0c8687ec839f08e79
parent 9242a7c7fd935dfc184544718d00cb0e54336264

Merge "Increase VTS GetHalService test timeout" into pie-vts-dev
am: 9242a7c7fd

Change-Id: Ic62538cec7df8885fc5ccb502eb78ee064f1eb1c

treble/vintf/VtsTrebleVintfTestBase.cpp

diff --git a/treble/vintf/VtsTrebleVintfTestBase.cpp b/treble/vintf/VtsTrebleVintfTestBase.cpp
index 2c68b19..d7a2897 100644
--- a/treble/vintf/VtsTrebleVintfTestBase.cpp
+++ b/treble/vintf/VtsTrebleVintfTestBase.cpp
@@ -130,10 +130,17 @@
     return getRawServiceInternal(fq_name, instance_name, true /* retry */,
                                  false /* getStub */);
   });
+  auto max_time = std::chrono::milliseconds(500);
+
+  // TODO(b/114157425): remove once android.hardware.renderscript@1.0-impl.so
+  // dlopen time reduced to normal level
+  if (fq_name == "android.hardware.renderscript@1.0::IDevice") {
+    max_time = std::chrono::seconds(1);
+  }
 
   std::future<sp<IBase>> future = task.get_future();
   std::thread(std::move(task)).detach();
-  auto status = future.wait_for(std::chrono::milliseconds(500));
+  auto status = future.wait_for(max_time);
 
   if (status != std::future_status::ready) return nullptr;