summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-10-26 12:51:44 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-26 12:51:44 -0700
commit7796e962da502e0adaff0d407023f731a83a422f (patch)
tree14923f1995903d1150751466015d003c06a69f6c /include
parent0777571e74bba3a63e6cbff3dfba920aea98c778 (diff)
parent5cae0d0699a169e468fff3e21165f35db12f2cde (diff)
downloadframeworks_native-7796e962da502e0adaff0d407023f731a83a422f.zip
frameworks_native-7796e962da502e0adaff0d407023f731a83a422f.tar.gz
frameworks_native-7796e962da502e0adaff0d407023f731a83a422f.tar.bz2
Merge "Rename SensorChannel to BitTube"
Diffstat (limited to 'include')
-rw-r--r--include/gui/BitTube.h (renamed from include/gui/SensorChannel.h)9
-rw-r--r--include/gui/ISensorEventConnection.h4
-rw-r--r--include/gui/SensorEventQueue.h4
3 files changed, 9 insertions, 8 deletions
diff --git a/include/gui/SensorChannel.h b/include/gui/BitTube.h
index bb54618..76389a0 100644
--- a/include/gui/SensorChannel.h
+++ b/include/gui/BitTube.h
@@ -28,14 +28,15 @@ namespace android {
// ----------------------------------------------------------------------------
class Parcel;
-class SensorChannel : public RefBase
+class BitTube : public RefBase
{
public:
- SensorChannel();
- SensorChannel(const Parcel& data);
- virtual ~SensorChannel();
+ BitTube();
+ BitTube(const Parcel& data);
+ virtual ~BitTube();
+ status_t initCheck() const;
int getFd() const;
ssize_t write(void const* vaddr, size_t size);
ssize_t read(void* vaddr, size_t size);
diff --git a/include/gui/ISensorEventConnection.h b/include/gui/ISensorEventConnection.h
index ed4e4cc..749065e 100644
--- a/include/gui/ISensorEventConnection.h
+++ b/include/gui/ISensorEventConnection.h
@@ -28,14 +28,14 @@
namespace android {
// ----------------------------------------------------------------------------
-class SensorChannel;
+class BitTube;
class ISensorEventConnection : public IInterface
{
public:
DECLARE_META_INTERFACE(SensorEventConnection);
- virtual sp<SensorChannel> getSensorChannel() const = 0;
+ virtual sp<BitTube> getSensorChannel() const = 0;
virtual status_t enableDisable(int handle, bool enabled) = 0;
virtual status_t setEventRate(int handle, nsecs_t ns) = 0;
};
diff --git a/include/gui/SensorEventQueue.h b/include/gui/SensorEventQueue.h
index 97dd391..ef7c6e3 100644
--- a/include/gui/SensorEventQueue.h
+++ b/include/gui/SensorEventQueue.h
@@ -24,7 +24,7 @@
#include <utils/RefBase.h>
#include <utils/Timers.h>
-#include <gui/SensorChannel.h>
+#include <gui/BitTube.h>
// ----------------------------------------------------------------------------
@@ -71,7 +71,7 @@ public:
private:
sp<Looper> getLooper() const;
sp<ISensorEventConnection> mSensorEventConnection;
- sp<SensorChannel> mSensorChannel;
+ sp<BitTube> mSensorChannel;
mutable Mutex mLock;
mutable sp<Looper> mLooper;
};