am 5d6aa951: Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev

* commit '5d6aa95129a13aae37a60b3e4246a0592dab396d':
  Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.

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 {