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

Commit 4de9afb7 authored by Robert Carr's avatar Robert Carr Committed by Rob Carr
Browse files

InputChannel JNI: Use libinput implementation of read/write. 

InputChannel now has parcelling implementations built in and
we don't need to duplicate it here anymore.

Bug: 80101428
Bug: 113136004
Bug: 111440400
Change-Id: Ide3e8a6416dc1babc3be6d520fc6646cc4d378b1
parent e1db3206

core/jni/android_view_InputChannel.cpp

+4 −13
Original line number Diff line number Diff line
@@ -202,17 +202,9 @@ static void android_view_InputChannel_nativeReadFromParcel(JNIEnv* env, jobject 
    if (parcel) {

        bool isInitialized = parcel->readInt32();

        if (isInitialized) {

            String8 name = parcel->readString8();

            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.");

                return;

            }

            InputChannel* inputChannel = new InputChannel();

            inputChannel->read(*parcel);



            InputChannel* inputChannel = new InputChannel(name.string(), dupFd);

            NativeInputChannel* nativeInputChannel = new NativeInputChannel(inputChannel);



            android_view_InputChannel_setNativeInputChannel(env, obj, nativeInputChannel);
@@ -230,8 +222,7 @@ static void android_view_InputChannel_nativeWriteToParcel(JNIEnv* env, jobject o 
            sp<InputChannel> inputChannel = nativeInputChannel->getInputChannel();



            parcel->writeInt32(1);

            parcel->writeString8(String8(inputChannel->getName().c_str()));

            parcel->writeDupFileDescriptor(inputChannel->getFd());

            inputChannel->write(*parcel);

        } else {

            parcel->writeInt32(0);

        }