summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2014-05-27 19:38:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-27 19:38:00 +0000
commit812f15f2f99df4de41a9fa4ccacfeb98e8f5e8ba (patch)
tree2b956b0b12c6356f1ea32d5d54129e876e7c5a3e /include
parent03b1a9db9d8edc2ee15062204b19c0fc340e5b69 (diff)
parentd9441e4c27bb7d0b1dfe2a8b5c1ee1714442648d (diff)
downloadframeworks_native-812f15f2f99df4de41a9fa4ccacfeb98e8f5e8ba.zip
frameworks_native-812f15f2f99df4de41a9fa4ccacfeb98e8f5e8ba.tar.gz
frameworks_native-812f15f2f99df4de41a9fa4ccacfeb98e8f5e8ba.tar.bz2
Merge "Surface maxDelay and isWakeUpSensor flag in Sensor.java."
Diffstat (limited to 'include')
-rw-r--r--include/gui/Sensor.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/gui/Sensor.h b/include/gui/Sensor.h
index 41a6cc6..c1c98b9 100644
--- a/include/gui/Sensor.h
+++ b/include/gui/Sensor.h
@@ -71,6 +71,7 @@ public:
int32_t getFifoMaxEventCount() const;
const String8& getStringType() const;
const String8& getRequiredPermission() const;
+ int32_t getMaxDelay() const;
bool isWakeUpSensor() const;
// LightFlattenable protocol
@@ -94,7 +95,7 @@ private:
int32_t mFifoMaxEventCount;
String8 mStringType;
String8 mRequiredPermission;
- // Todo: Surface this in java SDK.
+ int32_t mMaxDelay;
bool mWakeUpSensor;
static void flattenString8(void*& buffer, size_t& size, const String8& string8);
static bool unflattenString8(void const*& buffer, size_t& size, String8& outputString8);