diff options
Diffstat (limited to 'src/plugins/sensors/android')
-rw-r--r-- | src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java | 6 | ||||
-rw-r--r-- | src/plugins/sensors/android/src/androidjnisensors.cpp | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java b/src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java index 75f2e933..3067d401 100644 --- a/src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java +++ b/src/plugins/sensors/android/jar/src/org/qtproject/qt5/android/sensors/QtSensors.java @@ -42,7 +42,7 @@ package org.qtproject.qt5.android.sensors; import java.util.HashSet; import java.util.List; -import android.app.Activity; +import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; @@ -58,10 +58,10 @@ public class QtSensors implements SensorEventListener static SensorManager m_sensorManager = null; static SparseArray<Sensor> m_registeredSensors = new SparseArray<Sensor>(); static Object m_syncObject = new Object(); - static public void setActivity(Activity activity, Object acitvityDelegate) + static public void setContext(Context context) { try { - m_sensorManager = (SensorManager)activity.getSystemService(Activity.SENSOR_SERVICE); + m_sensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE); } catch(Exception e) { e.printStackTrace(); } diff --git a/src/plugins/sensors/android/src/androidjnisensors.cpp b/src/plugins/sensors/android/src/androidjnisensors.cpp index 67fe9078..5e0e4146 100644 --- a/src/plugins/sensors/android/src/androidjnisensors.cpp +++ b/src/plugins/sensors/android/src/androidjnisensors.cpp @@ -247,6 +247,11 @@ static bool registerNatives(JNIEnv *env) Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { + static bool initialized = false; + if (initialized) + return JNI_VERSION_1_6; + initialized = true; + typedef union { JNIEnv *nativeEnvironment; void *venv; |