From a1ea9a767df3de7b4b80f5f63dd2fb8b07932d67 Mon Sep 17 00:00:00 2001
From: SeeLook <945374+SeeLook@users.noreply.github.com>
Date: Sat, 17 Oct 2015 21:13:32 +0200
Subject: [PATCH] Added exeption handling when JNI method is called - avoids
crashes under Lolypop
---
src/libs/core/Android/tandroid.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libs/core/Android/tandroid.cpp b/src/libs/core/Android/tandroid.cpp
index 6fd18d525..8d12736ea 100644
--- a/src/libs/core/Android/tandroid.cpp
+++ b/src/libs/core/Android/tandroid.cpp
@@ -19,6 +19,7 @@
#include "tandroid.h"
#include <QtAndroidExtras/qandroidfunctions.h>
+#include <QtAndroidExtras/qandroidjnienvironment.h>
void Tandroid::setScreenLockDisabled() {
@@ -30,6 +31,9 @@ void Tandroid::setScreenLockDisabled() {
const int FLAG_FULLSCREEN = 1024;
// const int FLAG_FORCE_NOT_FULLSCREEN = 2048;
window.callMethod<void>("addFlags", "(I)V", FLAG_KEEP_SCREEN_ON | FLAG_FULLSCREEN);
+ QAndroidJniEnvironment env;
+ if (env->ExceptionCheck())
+ env->ExceptionClear();
}
}
}
--
GitLab