Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 375f8a76 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "libbinder_ndk_unit_test: shutdown wait time to 20s"" am: d7fe03a9 am: 55416603 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2610231



Change-Id: I3d74359b7a8fad44c15b569f5f0f8a048e6b7ff9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8979a7a5 55416603

libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ constexpr char kForcePersistNdkUnitTestService[] = "ForcePersistNdkUnitTestServi 
constexpr char kActiveServicesNdkUnitTestService[] = "ActiveServicesNdkUnitTestService";

constexpr char kActiveServicesNdkUnitTestService[] = "ActiveServicesNdkUnitTestService";

constexpr char kBinderNdkUnitTestServiceFlagged[] = "BinderNdkUnitTestFlagged";

constexpr char kBinderNdkUnitTestServiceFlagged[] = "BinderNdkUnitTestFlagged";





constexpr unsigned int kShutdownWaitTime = 20;

constexpr unsigned int kShutdownWaitTime = 11;

constexpr uint64_t kContextTestValue = 0xb4e42fb4d9a1d715;

constexpr uint64_t kContextTestValue = 0xb4e42fb4d9a1d715;





class MyTestFoo : public IFoo {

class MyTestFoo : public IFoo {