diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-21 18:10:22 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-07-21 18:10:22 -0700 |
| commit | 50558b956157dad980441bf4fb44931ce834e36b (patch) | |
| tree | 2d208a78ab3a1c77d91751b8bbe5cafd9415f0d8 /libs/gui/ISensorEventConnection.cpp | |
| parent | c1b11b1b37d0692bd3c63575c9f2c0d9fa566602 (diff) | |
| parent | bc54e63c84a517f0dca88ba900ff2b56719f685b (diff) | |
| download | frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.zip frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.tar.gz frameworks_base-50558b956157dad980441bf4fb44931ce834e36b.tar.bz2 | |
resolved conflicts for merge of bc54e63c to master
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
Diffstat (limited to 'libs/gui/ISensorEventConnection.cpp')
| -rw-r--r-- | libs/gui/ISensorEventConnection.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/gui/ISensorEventConnection.cpp b/libs/gui/ISensorEventConnection.cpp index 3e9d456..a5083fe 100644 --- a/libs/gui/ISensorEventConnection.cpp +++ b/libs/gui/ISensorEventConnection.cpp @@ -47,6 +47,7 @@ public: virtual sp<SensorChannel> getSensorChannel() const { Parcel data, reply; + data.writeInterfaceToken(ISensorEventConnection::getInterfaceDescriptor()); remote()->transact(GET_SENSOR_CHANNEL, data, &reply); return new SensorChannel(reply); } @@ -54,6 +55,7 @@ public: virtual status_t enableDisable(int handle, bool enabled) { Parcel data, reply; + data.writeInterfaceToken(ISensorEventConnection::getInterfaceDescriptor()); data.writeInt32(handle); data.writeInt32(enabled); remote()->transact(ENABLE_DISABLE, data, &reply); @@ -63,6 +65,7 @@ public: virtual status_t setEventRate(int handle, nsecs_t ns) { Parcel data, reply; + data.writeInterfaceToken(ISensorEventConnection::getInterfaceDescriptor()); data.writeInt32(handle); data.writeInt64(ns); remote()->transact(SET_EVENT_RATE, data, &reply); |