| commit | 12bd8d35fca98bf63e58e2b309f543a6f064ade6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 01 19:45:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 01 19:45:00 2023 +0000 |
| tree | 57babebdf38eb04e4c25a62a2c3593161e136d0f | |
| parent | 39d056f34e2d8ed83a1b9d4a41e6ce22bf7cc9f5 [diff] | |
| parent | 375f8a76ddd6960335ce8cf0ec9c2fb4baf4475f [diff] |
Merge "Revert "libbinder_ndk_unit_test: shutdown wait time to 20s"" am: d7fe03a951 am: 554166032a am: 375f8a76dd Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2610231 Change-Id: Id968a057521f55159fa83c4bfee4eafaf88d54eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp b/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp index 8c9844c..664894e 100644 --- a/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp +++ b/libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp
@@ -53,7 +53,7 @@ constexpr char kActiveServicesNdkUnitTestService[] = "ActiveServicesNdkUnitTestService"; constexpr char kBinderNdkUnitTestServiceFlagged[] = "BinderNdkUnitTestFlagged"; -constexpr unsigned int kShutdownWaitTime = 20; +constexpr unsigned int kShutdownWaitTime = 11; constexpr uint64_t kContextTestValue = 0xb4e42fb4d9a1d715; class MyTestFoo : public IFoo {