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

Commit 8ff1fa1d authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

gdx: Properly name external function am: 9751bca8 am: 1701681c 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2881056



Change-Id: Icf5bb86911555463473aed036ead9516f909f2f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb6900a2 1701681c

system/gd/module_jniloop_unittest.cc

+2 −4
Original line number Diff line number Diff line
@@ -41,12 +41,10 @@ std::promise<pid_t> protected_method_promise; 


}  // namespace



namespace module_jniloop {

// Global function with C linkage

void external_function(int /* a */, double /* b */, char /* c */) {

void external_function_jni(int /* a */, double /* b */, char /* c */) {

  external_function_promise.set_value(base::PlatformThread::CurrentId());

}

}  // namespace module_jniloop



// Module private implementation that is inaccessible externally

struct TestJniModule::PrivateImpl : public ModuleJniloop {
@@ -88,7 +86,7 @@ void TestJniModule::call_on_handler_protected_method(int loop_tid, int a, int b, 
void TestJniModule::call_on_jni_external_function(int loop_tid, int a, double b, char c) {

  external_function_promise = std::promise<pid_t>();

  auto future = external_function_promise.get_future();

  PostFunctionOnJni(&module_jniloop::external_function, a, b, c);

  PostFunctionOnJni(&external_function_jni, a, b, c);

  ASSERT_EQ(future.wait_for(std::chrono::seconds(3)), std::future_status::ready);

  ASSERT_EQ(future.get(), loop_tid);

}