From 8c3e55f4149deda3ec7c7a67fda81216d5f9af25 Mon Sep 17 00:00:00 2001
From: Ben Fennema <fennema@google.com>
Date: Wed, 2 Dec 2015 01:04:40 +0000
Subject: Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical
 data"

This reverts commit d4db70a7b8b2d136c46c50f89b276f8150be5fc2.

Change-Id: Ifb52d5595970a5178e12c2a90da4aac0e38f5942
---
 services/sensorservice/SensorDevice.cpp  | 15 ---------------
 services/sensorservice/SensorDevice.h    |  1 -
 services/sensorservice/SensorService.cpp |  8 --------
 services/sensorservice/SensorService.h   |  1 -
 4 files changed, 25 deletions(-)

(limited to 'services')

diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
index 48ae2fb..dd1bccf 100644
--- a/services/sensorservice/SensorDevice.cpp
+++ b/services/sensorservice/SensorDevice.cpp
@@ -407,21 +407,6 @@ status_t SensorDevice::setMode(uint32_t mode) {
      return mSensorModule->set_operation_mode(mode);
 }
 
-status_t SensorDevice::setSensorPhysicalData(const char* physicaldata)
-{
-    //ALOGD("SensorDevice::setSensorPhysicalData(%s)",physicaldata);
-    Mutex::Autolock _l(mLock);
-    if((mSensorModule->set_sensor_physical_data == NULL) || (getHalDeviceVersion() < SENSORS_DEVICE_API_VERSION_1_3_5))
-    {
-        return NO_INIT;
-    }
-    else
-    {
-        return mSensorModule->set_sensor_physical_data(physicaldata);
-    }
-}
-
-
 // ---------------------------------------------------------------------------
 
 int SensorDevice::Info::numActiveClients() {
diff --git a/services/sensorservice/SensorDevice.h b/services/sensorservice/SensorDevice.h
index f658497..c484849 100644
--- a/services/sensorservice/SensorDevice.h
+++ b/services/sensorservice/SensorDevice.h
@@ -104,7 +104,6 @@ public:
     void autoDisable(void *ident, int handle);
     status_t injectSensorData(const sensors_event_t *event);
     void dump(String8& result);
-    status_t setSensorPhysicalData(const char* physicaldata);
 };
 
 // ---------------------------------------------------------------------------
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 2548a3e..fd72b23 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -735,14 +735,6 @@ Vector<Sensor> SensorService::getSensorList(const String16& opPackageName)
     return accessibleSensorList;
 }
 
-status_t SensorService::setSensorPhysicalData(const char* physicaldata)
-{
-    SensorDevice& dev(SensorDevice::getInstance());
-
-    //ALOGD("SensorService::setSensorPhysicalData(%s)",physicaldata);
-    return dev.setSensorPhysicalData(physicaldata);
-}
-
 sp<ISensorEventConnection> SensorService::createSensorEventConnection(const String8& packageName,
         int requestedMode, const String16& opPackageName) {
     // Only 2 modes supported for a SensorEventConnection ... NORMAL and DATA_INJECTION.
diff --git a/services/sensorservice/SensorService.h b/services/sensorservice/SensorService.h
index 3a1ffb2..9a573ae 100644
--- a/services/sensorservice/SensorService.h
+++ b/services/sensorservice/SensorService.h
@@ -130,7 +130,6 @@ class SensorService :
     virtual sp<ISensorEventConnection> createSensorEventConnection(const String8& packageName,
              int requestedMode, const String16& opPackageName);
     virtual int isDataInjectionEnabled();
-    virtual status_t setSensorPhysicalData(const char* physicaldata);
     virtual status_t dump(int fd, const Vector<String16>& args);
 
     class SensorEventConnection : public BnSensorEventConnection, public LooperCallback {
-- 
cgit v1.1