diff options
| author | Aravind Akella <aakella@google.com> | 2014-04-11 19:34:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 19:34:53 +0000 |
| commit | ef89f7638c43ce5f73e32d487bf65c3375995e3b (patch) | |
| tree | 57d1ac879061b82241dc4184422a98834624ab70 /include/gui | |
| parent | 974279d98917c589181b70ea1c377842e7717643 (diff) | |
| parent | cf818ebbf07c6a20ef48d71bf82f8d4bdf3a398c (diff) | |
| download | frameworks_native-ef89f7638c43ce5f73e32d487bf65c3375995e3b.zip frameworks_native-ef89f7638c43ce5f73e32d487bf65c3375995e3b.tar.gz frameworks_native-ef89f7638c43ce5f73e32d487bf65c3375995e3b.tar.bz2 | |
am cf818ebb: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
* commit 'cf818ebbf07c6a20ef48d71bf82f8d4bdf3a398c':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
Diffstat (limited to 'include/gui')
| -rw-r--r-- | include/gui/Sensor.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/gui/Sensor.h b/include/gui/Sensor.h index 0c81426..033b262 100644 --- a/include/gui/Sensor.h +++ b/include/gui/Sensor.h @@ -69,6 +69,8 @@ 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; } @@ -89,6 +91,10 @@ 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); }; // ---------------------------------------------------------------------------- |