Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91e32898 authored by Jeff Brown's avatar Jeff Brown
Browse files

Clean up InputChannel file descriptor data type. 

File descriptors are ints.

Change-Id: Ie36733bf36ddfeaa9a09ef6ebd7bd2f1788f5d27
parent 58aedbc9

core/jni/android_view_InputChannel.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -199,9 +199,9 @@ static void android_view_InputChannel_nativeReadFromParcel(JNIEnv* env, jobject 
        bool isInitialized = parcel->readInt32();

        bool isInitialized = parcel->readInt32();

        if (isInitialized) {

        if (isInitialized) {

            String8 name = parcel->readString8();

            String8 name = parcel->readString8();

            int32_t rawFd = parcel->readFileDescriptor();

            int rawFd = parcel->readFileDescriptor();

            int32_t dupFd = dup(rawFd);

            int dupFd = dup(rawFd);

            if (rawFd < 0) {

            if (dupFd < 0) {

                ALOGE("Error %d dup channel fd %d.", errno, rawFd);

                ALOGE("Error %d dup channel fd %d.", errno, rawFd);

                jniThrowRuntimeException(env,

                jniThrowRuntimeException(env,

                        "Could not read input channel file descriptors from parcel.");

                        "Could not read input channel file descriptors from parcel.");

core/jni/android_view_InputEventReceiver.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ NativeInputEventReceiver::~NativeInputEventReceiver() { 
}

}





status_t NativeInputEventReceiver::initialize() {

status_t NativeInputEventReceiver::initialize() {

    int32_t receiveFd = mInputConsumer.getChannel()->getFd();

    int receiveFd = mInputConsumer.getChannel()->getFd();

    mLooper->addFd(receiveFd, 0, ALOOPER_EVENT_INPUT, handleReceiveCallback, this);

    mLooper->addFd(receiveFd, 0, ALOOPER_EVENT_INPUT, handleReceiveCallback, this);

    return OK;

    return OK;

}

}

include/ui/InputTransport.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ protected: 
    virtual ~InputChannel();

    virtual ~InputChannel();





public:

public:

    InputChannel(const String8& name, int32_t fd);

    InputChannel(const String8& name, int fd);





    /* Creates a pair of input channels.

    /* Creates a pair of input channels.

     *

     *
@@ -133,7 +133,7 @@ public: 
            sp<InputChannel>& outServerChannel, sp<InputChannel>& outClientChannel);

            sp<InputChannel>& outServerChannel, sp<InputChannel>& outClientChannel);





    inline String8 getName() const { return mName; }

    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.

    /* Sends a message to the other endpoint.

     *

     *
@@ -162,7 +162,7 @@ public: 




private:

private:

    String8 mName;

    String8 mName;

    int32_t mFd;

    int mFd;

};

};





/*

/*

services/input/InputDispatcher.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -3105,7 +3105,7 @@ status_t InputDispatcher::registerInputChannel(const sp<InputChannel>& inputChan 




        sp<Connection> connection = new Connection(inputChannel, inputWindowHandle, monitor);

        sp<Connection> connection = new Connection(inputChannel, inputWindowHandle, monitor);





        int32_t fd = inputChannel->getFd();

        int fd = inputChannel->getFd();

        mConnectionsByFd.add(fd, connection);

        mConnectionsByFd.add(fd, connection);





        if (monitor) {

        if (monitor) {