am 4369a4eb: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"

* commit '4369a4ebd5ae7567e7075bc82830b83178099ed5':
  Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"

2 files changed, 0 insertions, 28 deletions

diff --git a/include/android/sensor.h b/include/android/sensor.h
index b4e7ebe..129ea3e 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -281,28 +281,6 @@ float ASensor_getResolution(ASensor const* sensor);
  */
 int ASensor_getMinDelay(ASensor const* sensor);
 
-/*
- * Returns the maximum size of batches for this sensor. Batches will often be
- * smaller, as the hardware fifo might be used for other sensors.
- */
-int ASensor_getFifoMaxEventCount(ASensor const* sensor);
-
-/*
- * Returns the hardware batch fifo size reserved to this sensor.
- */
-int ASensor_getFifoReservedEventCount(ASensor const* sensor);
-
-/*
- * Returns this sensor's string type.
- */
-const char* ASensor_getStringType(ASensor const* sensor);
-
-/*
- * Returns the permission required to see or access this sensor, or the
- * empty string if none is required.
- */
-const char* ASensor_getRequiredPermission(ASensor const* sensor);
-
 
 #ifdef __cplusplus
 };
diff --git a/include/gui/Sensor.h b/include/gui/Sensor.h
index 033b262..0c81426 100644
--- a/include/gui/Sensor.h
+++ b/include/gui/Sensor.h
@@ -69,8 +69,6 @@ public:
     int32_t getVersion() const;
     int32_t getFifoReservedEventCount() const;
     int32_t getFifoMaxEventCount() const;
-    const String8& getStringType() const;
-    const String8& getRequiredPermission() const;
 
     // LightFlattenable protocol
     inline bool isFixedSize() const { return false; }
@@ -91,10 +89,6 @@ private:
     int32_t mVersion;
     int32_t mFifoReservedEventCount;
     int32_t mFifoMaxEventCount;
-    String8 mStringType;
-    String8 mRequiredPermission;
-    static void flattenString8(void*& buffer, size_t& size, const String8& string8);
-    static bool unflattenString8(void const*& buffer, size_t& size, String8& outputString8);
 };
 
 // ----------------------------------------------------------------------------