diff options
author | Etienne Le Grand <etn@google.com> | 2014-04-05 05:02:22 +0000 |
---|---|---|
committer | JP Abgrall <jpa@google.com> | 2014-04-05 06:13:41 +0000 |
commit | 30d6fd6b28aeacfe06ddc7adaac34e8a0032df40 (patch) | |
tree | ce2138f9edd7ed2c5a515389bcfdb2028d16f307 /include | |
parent | 33458f72e17be8e71f50e1f8843f7821d90934f5 (diff) | |
download | frameworks_native-30d6fd6b28aeacfe06ddc7adaac34e8a0032df40.zip frameworks_native-30d6fd6b28aeacfe06ddc7adaac34e8a0032df40.tar.gz frameworks_native-30d6fd6b28aeacfe06ddc7adaac34e8a0032df40.tar.bz2 |
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
This reverts commit c57a019e117117c5a76c772970b26cd0f5db8c6a.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
(cherry picked from commit 4369a4ebd5ae7567e7075bc82830b83178099ed5)
Diffstat (limited to 'include')
-rw-r--r-- | include/android/sensor.h | 22 | ||||
-rw-r--r-- | include/gui/Sensor.h | 6 |
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); }; // ---------------------------------------------------------------------------- |