resolved conflicts for merge of 00aea5c5 to master

Change-Id: Ie1769be863ee2d411eae451907a928db57882e14

diff --cc services/sensorservice/SensorDevice.cpp
Simple merge

diff --cc services/sensorservice/SensorDevice.h
index ca67ce2,227dab6..b50e205
--- 1/services/sensorservice/SensorDevice.h
--- 2/services/sensorservice/SensorDevice.h
+++ b/services/sensorservice/SensorDevice.h
@@@ -56,8 -56,8 +56,8 @@@ public
      ssize_t poll(sensors_event_t* buffer, size_t count);
      status_t activate(void* ident, int handle, int enabled);
      status_t setDelay(void* ident, int handle, int64_t ns);
-     status_t resetStateWithoutActuatingHardware(void *ident, int handle);
+     void autoDisable(void *ident, int handle);
 -    void dump(String8& result, char* buffer, size_t SIZE);
 +    void dump(String8& result);
  };
  
  // ---------------------------------------------------------------------------

diff --cc services/sensorservice/SensorService.cpp
index 99993ba,6481584..e3d2a60
--- 1/services/sensorservice/SensorService.cpp
--- 2/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@@ -270,14 -246,11 +270,12 @@@ void SensorService::cleanupAutoDisabled
      status_t err = NO_ERROR;
      for (int i=0 ; i<count ; i++) {
          int handle = buffer[i].sensor;
 -        if (getSensorType(handle) == SENSOR_TYPE_SIGNIFICANT_MOTION) {
 +        int type = buffer[i].type;
 +        if (type == SENSOR_TYPE_SIGNIFICANT_MOTION) {
              if (connection->hasSensor(handle)) {
                  sensor = mSensorMap.valueFor(handle);
-                 err = sensor ?sensor->resetStateWithoutActuatingHardware(connection.get(), handle)
-                         : status_t(BAD_VALUE);
-                 if (err != NO_ERROR) {
-                     ALOGE("Sensor Inteface: Resetting state failed with err: %d", err);
+                 if (sensor != NULL) {
+                     sensor->autoDisable(connection.get(), handle);
                  }
                  cleanupWithoutDisable(connection, handle);
              }

diff --cc services/sensorservice/SensorService.h
index 56b0a3e,fcdbc7d..69e5dbb
--- 1/services/sensorservice/SensorService.h
--- 2/services/sensorservice/SensorService.h
+++ b/services/sensorservice/SensorService.h
@@@ -111,14 -110,17 +111,16 @@@ class SensorService 
      DefaultKeyedVector<int, SensorInterface*> getActiveVirtualSensors() const;
  
      String8 getSensorName(int handle) const;
 -    int getSensorType(int handle) const;
      void recordLastValue(sensors_event_t const * buffer, size_t count);
      static void sortEventBuffer(sensors_event_t* buffer, size_t count);
 -    void registerSensor(SensorInterface* sensor);
 -    void registerVirtualSensor(SensorInterface* sensor);
 +    Sensor registerSensor(SensorInterface* sensor);
 +    Sensor registerVirtualSensor(SensorInterface* sensor);
-     status_t cleanupWithoutDisable(const sp<SensorEventConnection>& connection,
-             int handle);
+     status_t cleanupWithoutDisable(
+             const sp<SensorEventConnection>& connection, int handle);
+     status_t cleanupWithoutDisableLocked(
+             const sp<SensorEventConnection>& connection, int handle);
      void cleanupAutoDisabledSensor(const sp<SensorEventConnection>& connection,
 -        sensors_event_t const* buffer, const int count);
 +            sensors_event_t const* buffer, const int count);
  
      // constants
      Vector<Sensor> mSensorList;