summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/sensors/android')
-rw-r--r--src/plugins/sensors/android/androidaccelerometer.cpp12
-rw-r--r--src/plugins/sensors/android/sensormanager.cpp2
2 files changed, 10 insertions, 4 deletions
diff --git a/src/plugins/sensors/android/androidaccelerometer.cpp b/src/plugins/sensors/android/androidaccelerometer.cpp
index c9f5141e..f38e0047 100644
--- a/src/plugins/sensors/android/androidaccelerometer.cpp
+++ b/src/plugins/sensors/android/androidaccelerometer.cpp
@@ -82,18 +82,24 @@ void AndroidAccelerometer::applyAccelerationMode(QAccelerometer::AccelerationMod
{
switch (accelerationMode) {
case QAccelerometer::Gravity:
- if (!(m_accelerationModes & Gravity))
+ if (!(m_accelerationModes & Gravity)) {
qWarning() << "Gravity sensor missing";
+ return;
+ }
setSensorType(ASENSOR_TYPE_GRAVITY);
break;
case QAccelerometer::User:
- if (!(m_accelerationModes & LinearAcceleration))
+ if (!(m_accelerationModes & LinearAcceleration)) {
qWarning() << "Linear acceleration sensor missing";
+ return;
+ }
setSensorType(ASENSOR_TYPE_LINEAR_ACCELERATION);
break;
case QAccelerometer::Combined:
- if (!(m_accelerationModes & Accelerometer))
+ if (!(m_accelerationModes & Accelerometer)) {
qWarning() << "Accelerometer sensor missing";
+ return;
+ }
setSensorType(ASENSOR_TYPE_ACCELEROMETER);
break;
}
diff --git a/src/plugins/sensors/android/sensormanager.cpp b/src/plugins/sensors/android/sensormanager.cpp
index 590f478c..542e54c9 100644
--- a/src/plugins/sensors/android/sensormanager.cpp
+++ b/src/plugins/sensors/android/sensormanager.cpp
@@ -73,7 +73,7 @@ ALooper *SensorManager::looper() const
static inline ASensorManager* androidManager()
{
#if __ANDROID_API__ >= 26
- retrun ASensorManager_getInstanceForPackage(QJNIObjectPrivate{QtAndroidPrivate::context()}
+ return ASensorManager_getInstanceForPackage(QJNIObjectPrivate{QtAndroidPrivate::context()}
.callObjectMethod("getPackageName", "()Ljava/lang/String;")
.toString().toUtf8().constData());
#else