msm8226-common: sync changes with cm

2 files changed, 0 insertions, 27 deletions

diff --git a/libsensors/falcon-peregrine/LightProxSensor.cpp b/libsensors/falcon-peregrine/LightProxSensor.cpp
index c28e5ce..887f21f 100644
--- a/libsensors/falcon-peregrine/LightProxSensor.cpp
+++ b/libsensors/falcon-peregrine/LightProxSensor.cpp
@@ -82,16 +82,6 @@ int LightProxSensor::setDelay(int32_t handle, int64_t ns)
     return 0;
 }
 
-void LightProxSensor::setProxInitialState()
-{
-    struct input_absinfo absinfo;
-    if (!ioctl(data_fd, EVIOCGABS(EVENT_TYPE_PROXIMITY), &absinfo)) {
-        // make sure to report an event immediately
-        mProxHasPendingEvent = true;
-        mPendingEvents[PROX].distance = absinfo.value * ADJUST_PROX;
-    }
-}
-
 int LightProxSensor::enable(int32_t handle, int en)
 {
     char enable_path[PATH_MAX];
@@ -128,31 +118,17 @@ int LightProxSensor::enable(int32_t handle, int en)
         }
         close(fd);
         mEnabled[sensor] = enable;
-        if (sensor == PROX)
-            setProxInitialState();
         return 0;
     }
 
     return fd;
 }
 
-bool LightProxSensor::hasPendingEvents() const
-{
-    return mProxHasPendingEvent;
-}
-
 int LightProxSensor::readEvents(sensors_event_t* data, int count)
 {
     if (count < 1)
         return -EINVAL;
 
-    if (mProxHasPendingEvent) {
-        mProxHasPendingEvent = false;
-        mPendingEvents[PROX].timestamp = getTimestamp();
-        *data = mPendingEvents[PROX];
-        return mEnabled[PROX] ? 1 : 0;
-    }
-
     ssize_t n = mInputReader.fill(data_fd);
     if (n < 0)
         return n;
diff --git a/libsensors/falcon-peregrine/LightProxSensor.h b/libsensors/falcon-peregrine/LightProxSensor.h
index d7f4bb0..bdd3e49 100644
--- a/libsensors/falcon-peregrine/LightProxSensor.h
+++ b/libsensors/falcon-peregrine/LightProxSensor.h
@@ -35,14 +35,11 @@ private:
     sensors_event_t mPendingEvents[NUM_SENSORS];
     uint32_t mPendingEventsMask;
     int mPendingEventsFlushCount[NUM_SENSORS];
-    bool mProxHasPendingEvent;
-    void setProxInitialState();
 
 public:
             LightProxSensor();
     virtual ~LightProxSensor();
     virtual int readEvents(sensors_event_t* data, int count);
-    virtual bool hasPendingEvents() const;
     virtual int setDelay(int32_t handle, int64_t ns);
     virtual int enable(int32_t handle, int enabled);
     virtual int flush(int handle);