summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorAravind Akella <aakella@google.com>2013-10-11 02:05:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-11 02:05:41 +0000
commit5d6aa95129a13aae37a60b3e4246a0592dab396d (patch)
tree96d4b3ab0a7ffa167ff7173ae8beba1c0ba01d46 /libs
parent5c65efe2b1d632226f02751e6b1d3cfd7c8ecb26 (diff)
parent701166d9f60a6e1149ff568aec0e03f3f3925292 (diff)
downloadframeworks_native-5d6aa95129a13aae37a60b3e4246a0592dab396d.zip
frameworks_native-5d6aa95129a13aae37a60b3e4246a0592dab396d.tar.gz
frameworks_native-5d6aa95129a13aae37a60b3e4246a0592dab396d.tar.bz2
Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/gui/ISensorEventConnection.cpp6
-rw-r--r--libs/gui/SensorEventQueue.cpp4
2 files changed, 4 insertions, 6 deletions
diff --git a/libs/gui/ISensorEventConnection.cpp b/libs/gui/ISensorEventConnection.cpp
index a80c661..28fcb53 100644
--- a/libs/gui/ISensorEventConnection.cpp
+++ b/libs/gui/ISensorEventConnection.cpp
@@ -77,10 +77,9 @@ public:
return reply.readInt32();
}
- virtual status_t flushSensor(int handle) {
+ virtual status_t flush() {
Parcel data, reply;
data.writeInterfaceToken(ISensorEventConnection::getInterfaceDescriptor());
- data.writeInt32(handle);
remote()->transact(FLUSH_SENSOR, data, &reply);
return reply.readInt32();
}
@@ -122,8 +121,7 @@ status_t BnSensorEventConnection::onTransact(
} break;
case FLUSH_SENSOR: {
CHECK_INTERFACE(ISensorEventConnection, data, reply);
- int handle = data.readInt32();
- status_t result = flushSensor(handle);
+ status_t result = flush();
reply->writeInt32(result);
return NO_ERROR;
} break;
diff --git a/libs/gui/SensorEventQueue.cpp b/libs/gui/SensorEventQueue.cpp
index ab50c1d..c365671 100644
--- a/libs/gui/SensorEventQueue.cpp
+++ b/libs/gui/SensorEventQueue.cpp
@@ -132,8 +132,8 @@ status_t SensorEventQueue::enableSensor(int32_t handle, int32_t samplingPeriodUs
us2ns(maxBatchReportLatencyUs), reservedFlags);
}
-status_t SensorEventQueue::flushSensor(int32_t handle) const {
- return mSensorEventConnection->flushSensor(handle);
+status_t SensorEventQueue::flush() const {
+ return mSensorEventConnection->flush();
}
status_t SensorEventQueue::disableSensor(int32_t handle) const {