Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cafc1e0 authored by Ashutosh Joshi's avatar Ashutosh Joshi
Browse files

Revert "sensorservice: Remove ENABLE_TREBLE flag." 

This reverts commit d333511e.

Change-Id: I6812643a7d0265f3a64a03a35e4d5a2359ba87cf
parent d333511e

services/sensorservice/Android.mk

+13 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ LOCAL_SRC_FILES:= \ 
    OrientationSensor.cpp \

    RecentEventLogger.cpp \

    RotationVectorSensor.cpp \

    SensorDevice.cpp \

    SensorDirectConnection.cpp \

    SensorEventConnection.cpp \

    SensorFusion.cpp \
@@ -26,6 +25,13 @@ LOCAL_CFLAGS += -Wall -Werror -Wextra 


LOCAL_CFLAGS += -fvisibility=hidden



ifeq ($(ENABLE_TREBLE), true)

LOCAL_SRC_FILES += SensorDeviceTreble.cpp

LOCAL_CFLAGS += -DENABLE_TREBLE=1

else

LOCAL_SRC_FILES += SensorDevice.cpp

endif



LOCAL_SHARED_LIBRARIES := \

    libcutils \

    libhardware \
@@ -36,6 +42,10 @@ LOCAL_SHARED_LIBRARIES := \ 
    libui \

    libgui \

    libcrypto \



ifeq ($(ENABLE_TREBLE), true)



LOCAL_SHARED_LIBRARIES += \

    libbase \

    libhidlbase \

    libhidltransport \
@@ -45,6 +55,8 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_STATIC_LIBRARIES := \

    android.hardware.sensors@1.0-convert



endif  # ENABLE_TREBLE



LOCAL_MODULE:= libsensorservice



include $(BUILD_SHARED_LIBRARY)

services/sensorservice/SensorDevice.cpp

+201 −306

File changed.

Preview size limit exceeded, changes collapsed.

services/sensorservice/SensorDevice.h

+12 −3
Original line number Diff line number Diff line
@@ -20,16 +20,19 @@ 
#include "SensorServiceUtils.h"



#include <gui/Sensor.h>

#include <stdint.h>

#include <sys/types.h>

#include <utils/KeyedVector.h>

#include <utils/Singleton.h>

#include <utils/String8.h>



#include <stdint.h>

#include <sys/types.h>

#include <string>



#ifdef ENABLE_TREBLE

#include <map>



#include "android/hardware/sensors/1.0/ISensors.h"

#endif



// ---------------------------------------------------------------------------
@@ -73,10 +76,14 @@ public: 
    virtual std::string dump() const;

private:

    friend class Singleton<SensorDevice>;



#ifdef ENABLE_TREBLE

    sp<android::hardware::sensors::V1_0::ISensors> mSensors;

    Vector<sensor_t> mSensorList;

    std::map<int32_t, sensor_t*> mConnectedDynamicSensors;

#else

    sensors_poll_device_1_t* mSensorDevice;

    struct sensors_module_t* mSensorModule;

#endif



    static const nsecs_t MINIMUM_EVENTS_PERIOD =   1000000; // 1000 Hz

    mutable Mutex mLock; // protect mActivationCount[].batchParams
@@ -131,6 +138,7 @@ private: 
    bool isClientDisabled(void* ident);

    bool isClientDisabledLocked(void* ident);



#ifdef ENABLE_TREBLE

    using Event = hardware::sensors::V1_0::Event;

    using SensorInfo = hardware::sensors::V1_0::SensorInfo;
@@ -142,6 +150,7 @@ private: 
            sensors_event_t *dst);



    bool mIsDirectReportSupported;

#endif  // ENABLE_TREBLE

};



// ---------------------------------------------------------------------------

services/sensorservice/SensorDeviceTreble.cpp

0 → 100644
+639 −0

File added.

Preview size limit exceeded, changes collapsed.