diff options
-rw-r--r-- | vcl/android/androidinst.cxx | 17 | ||||
-rw-r--r-- | vcl/inc/android/androidinst.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/salinst.hxx | 3 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 5 |
4 files changed, 28 insertions, 0 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index da3889145bb7..1cb11bd7c1e5 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -58,10 +58,12 @@ AndroidSalInstance *AndroidSalInstance::getInstance() AndroidSalInstance::AndroidSalInstance( std::unique_ptr<SalYieldMutex> pMutex ) : SvpSalInstance( std::move(pMutex) ) { + // FIXME: remove when uniPoll & runLoop is the only android entry poit. int res = (lo_get_javavm())->AttachCurrentThread(&m_pJNIEnv, NULL); LOGI("AttachCurrentThread res=%d env=%p", res, m_pJNIEnv); } +// This is never called on Android until app exit. AndroidSalInstance::~AndroidSalInstance() { int res = (lo_get_javavm())->DetachCurrentThread(); @@ -79,6 +81,21 @@ bool AndroidSalInstance::AnyInput( VclInputFlags nType ) return SvpSalInstance::s_pDefaultInstance->HasUserEvents(); } +void AndroidSalInstance::updateMainThread() +{ + int res = (lo_get_javavm())->AttachCurrentThread(&m_pJNIEnv, NULL); + LOGI("updateMainThread AttachCurrentThread res=%d env=%p", res, m_pJNIEnv); + SvpSalInstance::updateMainThread(); +} + +void AndroidSalInstance::releaseMainThread() +{ + int res = (lo_get_javavm())->DetachCurrentThread(); + LOGI("releaseMainThread DetachCurrentThread res=%d", res); + + SvpSalInstance::releaseMainThread(); +} + class AndroidSalSystem : public SvpSalSystem { public: AndroidSalSystem() : SvpSalSystem() {} diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx index 49758f3efd70..526174b14951 100644 --- a/vcl/inc/android/androidinst.hxx +++ b/vcl/inc/android/androidinst.hxx @@ -38,6 +38,9 @@ public: // mainloop pieces virtual bool AnyInput( VclInputFlags nType ); + + virtual void updateMainThread(); + virtual void releaseMainThread(); }; #endif // INCLUDED_VCL_INC_ANDROID_ANDROIDINST_HXX diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index e35cd78df4fb..6ad6133f6129 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -195,7 +195,10 @@ public: virtual void jobStartedPrinterUpdate() {} virtual void jobEndedPrinterUpdate() {} + /// Set the app's (somewhat) magic/main-thread to this one. virtual void updateMainThread() {} + /// Disconnect that - good for detatching from the JavaVM on Android. + virtual void releaseMainThread() {} /// get information about underlying versions virtual OUString getOSVersion() { return OUString("-"); } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index a39186647741..fed84899714c 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1676,6 +1676,11 @@ void unregisterPollCallbacks() ImplSVData * pSVData = ImplGetSVData(); if (pSVData) { + // Not hyper-elegant - but in the case of Android & unipoll we need to detach + // this thread from the JVM's clutches to avoid a crash closing document + if (pSVData->mpPollClosure && pSVData->mpDefInst) + pSVData->mpDefInst->releaseMainThread(); + // Just set mpPollClosure to null as that is what calling this means, that the callback data // points to an object that no longer exists. In particular, don't set // pSVData->mpPollCallback to nullptr as that is used to detect whether Unipoll is in use in |