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

Unverified Commit a58a9e01 authored by Michael Bestas's avatar Michael Bestas
Browse files

Revert "libgui: Provide M-compatible sensors ABI" 

* A shim should be used for this

This reverts commit aee75f71.

Change-Id: Id8d83d318021436fa835f2f3a1c9c50956a9d0ea
parent be0d6af4

include/gui/SensorManager.h

+0 −16
Original line number Diff line number Diff line
@@ -54,11 +54,7 @@ public: 
    static SensorManager& getInstanceForPackage(const String16& packageName);

    ~SensorManager();



#ifdef COMPAT_SENSORS_M

    ssize_t getSensorList(Sensor const* const** list) const;

#else

    ssize_t getSensorList(Sensor const* const** list);

#endif

    ssize_t getDynamicSensorList(Vector<Sensor>& list);

    Sensor const* getDefaultSensor(int type);

    sp<SensorEventQueue> createEventQueue(String8 packageName = String8(""), int mode = 0);
@@ -69,29 +65,17 @@ private: 
    void sensorManagerDied();



    SensorManager(const String16& opPackageName);

#ifdef COMPAT_SENSORS_M

    status_t assertStateLocked() const;

#else

    status_t assertStateLocked();

#endif



private:

    static Mutex sLock;

    static std::map<String16, SensorManager*> sPackageInstances;



#ifdef COMPAT_SENSORS_M

    mutable Mutex mLock;

    mutable sp<ISensorServer> mSensorServer;

    mutable Sensor const** mSensorList;

    mutable Vector<Sensor> mSensors;

    mutable sp<IBinder::DeathRecipient> mDeathObserver;

#else

    Mutex mLock;

    sp<ISensorServer> mSensorServer;

    Sensor const** mSensorList;

    Vector<Sensor> mSensors;

    sp<IBinder::DeathRecipient> mDeathObserver;

#endif

    const String16 mOpPackageName;

};

libs/gui/SensorManager.cpp

+2 −12
Original line number Diff line number Diff line
@@ -106,12 +106,7 @@ void SensorManager::sensorManagerDied() { 
    mSensors.clear();

}



#ifdef COMPAT_SENSORS_M

status_t SensorManager::assertStateLocked() const

#else

status_t SensorManager::assertStateLocked()

#endif

{

status_t SensorManager::assertStateLocked() {

    bool initSensorManager = false;

    if (mSensorServer == NULL) {

        initSensorManager = true;
@@ -166,12 +161,7 @@ status_t SensorManager::assertStateLocked() 
    return NO_ERROR;

}



#ifdef COMPAT_SENSORS_M

ssize_t SensorManager::getSensorList(Sensor const* const** list) const

#else

ssize_t SensorManager::getSensorList(Sensor const* const** list)

#endif

{

ssize_t SensorManager::getSensorList(Sensor const* const** list) {

    Mutex::Autolock _l(mLock);

    status_t err = assertStateLocked();

    if (err < 0) {