tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Fix default RunLoop not stopping

Browse Source 
stop() for default RunLoop is only used by unit tests and we need
to wake the ALooper to get past run().
This commit is contained in:
Thiago Marcos P. Santos
2016-07-01 12:21:22 +03:00
parent 2bf4e20052
commit 70d4ebb347
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/android/src/run_loop.cpp
View File

@@ -36,9 +36,15 @@ int looperCallbackDefault(int fd, int, void* data) {
int buffer[1];
while (read(fd, buffer, sizeof(buffer)) > 0) {}
auto runLoop = reinterpret_cast<RunLoop*>(data);
auto runLoopImpl = reinterpret_cast<RunLoop::Impl*>(data);
auto runLoop = runLoopImpl->runLoop;
runLoop->runOnce();
if (!runLoopImpl->running) {
ALooper_wake(runLoopImpl->loop);
}
return 1;
}
@@ -47,7 +53,7 @@ int looperCallbackDefault(int fd, int, void* data) {
namespace mbgl {
namespace util {
RunLoop::Impl::Impl(RunLoop* runLoop, RunLoop::Type type) {
RunLoop::Impl::Impl(RunLoop* runLoop_, RunLoop::Type type) : runLoop(runLoop_) {
using namespace mbgl::android;
detach = attach_jni_thread(theJVM, &env, "");
@@ -73,7 +79,7 @@ RunLoop::Impl::Impl(RunLoop* runLoop, RunLoop::Type type) {
break;
case Type::Default:
ret = ALooper_addFd(loop, fds[PIPE_OUT], ALOOPER_POLL_CALLBACK,
ALOOPER_EVENT_INPUT, looperCallbackDefault, runLoop);
ALOOPER_EVENT_INPUT, looperCallbackDefault, this);
break;
}