Merge "Clean up InputChannel file descriptor data type."

Author: Jeff Brown

core/jni/android_view_InputChannel.cpp

@@ -199,9 +199,9 @@ static void android_view_InputChannel_nativeReadFromParcel(JNIEnv* env, jobject
         bool isInitialized = parcel->readInt32();
         if (isInitialized) {
             String8 name = parcel->readString8();
-            int32_t rawFd = parcel->readFileDescriptor();
-            int32_t dupFd = dup(rawFd);
-            if (rawFd < 0) {
+            int rawFd = parcel->readFileDescriptor();
+            int dupFd = dup(rawFd);
+            if (dupFd < 0) {
                 ALOGE("Error %d dup channel fd %d.", errno, rawFd);
                 jniThrowRuntimeException(env,
                         "Could not read input channel file descriptors from parcel.");

core/jni/android_view_InputEventReceiver.cpp

@@ -93,7 +93,7 @@ NativeInputEventReceiver::~NativeInputEventReceiver() {
 }
 
 status_t NativeInputEventReceiver::initialize() {
-    int32_t receiveFd = mInputConsumer.getChannel()->getFd();
+    int receiveFd = mInputConsumer.getChannel()->getFd();
     mLooper->addFd(receiveFd, 0, ALOOPER_EVENT_INPUT, handleReceiveCallback, this);
     return OK;
 }

include/ui/InputTransport.h

@@ -123,7 +123,7 @@ class InputChannel : public RefBase {
     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 @@ class InputChannel : public RefBase {
             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 @@ class InputChannel : public RefBase {
 
 private:
     String8 mName;
-    int32_t mFd;
+    int mFd;
 };
 
 /*

services/input/InputDispatcher.cpp

@@ -3105,7 +3105,7 @@ status_t InputDispatcher::registerInputChannel(const sp<InputChannel>& inputChan
 
         sp<Connection> connection = new Connection(inputChannel, inputWindowHandle, monitor);
 
-        int32_t fd = inputChannel->getFd();
+        int fd = inputChannel->getFd();
         mConnectionsByFd.add(fd, connection);
 
         if (monitor) {