summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2012-02-14 17:11:41 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-02-14 17:11:41 -0800
commit94d0070b96f8635428bf1ee9d74bbe87fea59e3e (patch)
tree390100633ecc3f49f8b3968f892dfc4a5b04f7cd
parent4176e1c874021e8a0444be05f6c29b671b92f951 (diff)
parent9491e81ff6a3e29ea31c9582ee1c6ab23c0e3e54 (diff)
Merge "Clean up InputChannel file descriptor data type."
-rw-r--r--include/ui/InputTransport.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/ui/InputTransport.h b/include/ui/InputTransport.h
index 1f738cdbdc..0facce313f 100644
--- a/include/ui/InputTransport.h
+++ b/include/ui/InputTransport.h
@@ -123,7 +123,7 @@ protected:
virtual ~InputChannel();
public:
- InputChannel(const String8& name, int32_t fd);
+ InputChannel(const String8& name, int fd);
/* Creates a pair of input channels.
*
@@ -133,7 +133,7 @@ public:
sp<InputChannel>& outServerChannel, sp<InputChannel>& outClientChannel);
inline String8 getName() const { return mName; }
- inline int32_t getFd() const { return mFd; }
+ inline int getFd() const { return mFd; }
/* Sends a message to the other endpoint.
*
@@ -162,7 +162,7 @@ public:
private:
String8 mName;
- int32_t mFd;
+ int mFd;
};
/*