Series of crash fixes from Mer, squashed

        1)tracing plugin loading

        2)m_remoteSensorManager can be nullptr

        But it seems it does not solve incorrect initialization in the case
        manager interface is nullptr: init() for different sensors does not
        check initDone

        3)split initSensor() to template function and function

        most of initSensor() does not depend on template param, so it is
        better to split it -> less code should be generated

        4)do not use sensor manager if it is invalid

        5)correct class members initialization order

        6)assert sensor interface is not null

        From what I saw according to logic it should not happen so using
        Q_ASSERT for better maintainability

        7)check local interface pointer in SensorfwTapSensor::start()

        Signed-off-by: Denis Zalevskiy <denis.zalevskiy@jolla.com>

Change-Id: I5c1bf3999ad2268c0dba9b3fe511d999c2e63fd9
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 6 insertions, 71 deletions

diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
index 7cf56844..26bc4aae 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h
@@ -77,85 +77,20 @@ protected:
     template<typename T>
     void initSensor(bool &initDone)
     {
-
         const QString name = sensorName();
 
         if (!initDone) {
+            if (!m_remoteSensorManager) {
+                qDebug() << "There is no sensor manager yet, do not initialize" << name;
+                return;
+            }
             if (!m_remoteSensorManager->loadPlugin(name)) {
                 sensorError(KErrNotFound);
                 return;
             }
             m_remoteSensorManager->registerSensorInterface<T>(name);
         }
-        m_sensorInterface = T::controlInterface(name);
-        if (!m_sensorInterface) {
-            m_sensorInterface = const_cast<T*>(T::listenInterface(name));
-        }
-        if (!m_sensorInterface) {
-            sensorError(KErrNotFound);
-            return;
-        }
-        if (!m_sensorInterface) {
-            sensorError(KErrNotFound);
-            return;
-        }
-
-        initDone = true;
-
-        //metadata
-        QList<DataRange> intervals = m_sensorInterface->getAvailableIntervals();
-
-        for (int i = 0, l = intervals.size(); i < l; i++) {
-            qreal intervalMax = ((DataRange)(intervals.at(i))).max;
-            qreal intervalMin =((DataRange)(intervals.at(i))).min;
-
-            if (intervalMin == 0 && intervalMax == 0) {
-                // 0 interval has different meanings in e.g. magge/acce
-                // magge -> best-effort
-                // acce -> lowest possible
-                // in Qt API setting 0 means default
-                continue;
-            }
-
-            qreal rateMin = intervalMax < 1 ? 1 : 1 / intervalMax * 1000;
-            rateMin = rateMin < 1 ? 1 : rateMin;
-
-            intervalMin = intervalMin < 1 ? 10: intervalMin;     // do not divide with 0
-            qreal rateMax = 1 / intervalMin * 1000;
-            addDataRate(rateMin, rateMax);
-        }
-
-        //bufferSizes
-        if (m_bufferingSensors.contains(sensor()->identifier())) {
-
-            IntegerRangeList sizes = m_sensorInterface->getAvailableBufferSizes();
-            int l = sizes.size();
-            for (int i = 0; i < l; i++) {
-                int second = sizes.at(i).second;
-                m_maxBufferSize = second > m_bufferSize ? second : m_maxBufferSize;
-            }
-            m_maxBufferSize = m_maxBufferSize < 0 ? 1 : m_maxBufferSize;
-            //SensorFW guarantees to provide the most efficient size first
-            //TODO: remove from comments
-            //m_efficientBufferSize  = m_sensorInterface->hwBuffering()? (l>0?sizes.at(0).first:1) : 1;
-        }
-        else
-            m_maxBufferSize = 1;
-
-        sensor()->setMaxBufferSize(m_maxBufferSize);
-        sensor()->setEfficientBufferSize(m_efficientBufferSize);
-
-        QByteArray type = sensor()->type();
-        if (type == QAmbientLightSensor::type) return;   // SensorFW returns lux values, plugin enumerated values
-        if (type == QIRProximitySensor::type) return;    // SensorFW returns raw reflectance values, plugin % of max reflectance
-        if (name == "accelerometersensor") return;      // SensorFW returns milliGs, plugin m/s^2
-        if (name == "magnetometersensor") return;       // SensorFW returns nanoTeslas, plugin Teslas
-        if (name == "gyroscopesensor") return;          // SensorFW returns DSPs, plugin milliDSPs
-
-        setDescription(m_sensorInterface->description());
-
-        if (name == "tapsensor") return;
-        setRanges();
+        initDone = initSensorInterface(name);
     };
 
 
@@ -166,7 +101,7 @@ protected:
     bool reinitIsNeeded;
 
 private:
-
+    bool initSensorInterface(QString const &);
     static SensorManagerInterface* m_remoteSensorManager;
     int m_prevOutputRange;
     bool doConnectAfterCheck();