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

Commit dda9f6c2 authored by Chris Ye's avatar Chris Ye Committed by Android (Google) Code Review
Browse files

Merge "AIDL-ize InputManager IIputFlinger interface."

parents bd1c70cb 0bf43810
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -180,7 +180,8 @@ static jlong android_view_InputChannel_nativeReadFromParcel(JNIEnv* env, jobject
    if (parcel) {
    if (parcel) {
        bool isInitialized = parcel->readInt32();
        bool isInitialized = parcel->readInt32();
        if (isInitialized) {
        if (isInitialized) {
            sp<InputChannel> inputChannel = InputChannel::read(*parcel);
            sp<InputChannel> inputChannel = new InputChannel();
            inputChannel->readFromParcel(parcel);
            NativeInputChannel* nativeInputChannel = new NativeInputChannel(inputChannel);
            NativeInputChannel* nativeInputChannel = new NativeInputChannel(inputChannel);
            return reinterpret_cast<jlong>(nativeInputChannel);
            return reinterpret_cast<jlong>(nativeInputChannel);
        }
        }
@@ -203,7 +204,7 @@ static void android_view_InputChannel_nativeWriteToParcel(JNIEnv* env, jobject o
        return;
        return;
    }
    }
    parcel->writeInt32(1); // initialized
    parcel->writeInt32(1); // initialized
    nativeInputChannel->getInputChannel()->write(*parcel);
    nativeInputChannel->getInputChannel()->writeToParcel(parcel);
}
}


static jstring android_view_InputChannel_nativeGetName(JNIEnv* env, jobject obj, jlong channel) {
static jstring android_view_InputChannel_nativeGetName(JNIEnv* env, jobject obj, jlong channel) {