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

Commit e556f11b authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9 am: 43fd84a0 

am: 0d0ccb0c

Change-Id: I0abbba291721af2b66735dcbd33bbc406767536c
parents 1b4cdf90 0d0ccb0c

core/jni/android_view_InputChannel.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -111,11 +111,12 @@ void android_view_InputChannel_setDisposeCallback(JNIEnv* env, jobject inputChan 
}

}





static jobject android_view_InputChannel_createInputChannel(JNIEnv* env,

static jobject android_view_InputChannel_createInputChannel(JNIEnv* env,

        NativeInputChannel* nativeInputChannel) {

        std::unique_ptr<NativeInputChannel> nativeInputChannel) {

    jobject inputChannelObj = env->NewObject(gInputChannelClassInfo.clazz,

    jobject inputChannelObj = env->NewObject(gInputChannelClassInfo.clazz,

            gInputChannelClassInfo.ctor);

            gInputChannelClassInfo.ctor);

    if (inputChannelObj) {

    if (inputChannelObj) {

        android_view_InputChannel_setNativeInputChannel(env, inputChannelObj, nativeInputChannel);

        android_view_InputChannel_setNativeInputChannel(env, inputChannelObj,

                 nativeInputChannel.release());

    }

    }

    return inputChannelObj;

    return inputChannelObj;

}

}
@@ -143,13 +144,13 @@ static jobjectArray android_view_InputChannel_nativeOpenInputChannelPair(JNIEnv* 
    }

    }





    jobject serverChannelObj = android_view_InputChannel_createInputChannel(env,

    jobject serverChannelObj = android_view_InputChannel_createInputChannel(env,

            new NativeInputChannel(serverChannel));

            std::make_unique<NativeInputChannel>(serverChannel));

    if (env->ExceptionCheck()) {

    if (env->ExceptionCheck()) {

        return NULL;

        return NULL;

    }

    }





    jobject clientChannelObj = android_view_InputChannel_createInputChannel(env,

    jobject clientChannelObj = android_view_InputChannel_createInputChannel(env,

            new NativeInputChannel(clientChannel));

            std::make_unique<NativeInputChannel>(clientChannel));

    if (env->ExceptionCheck()) {

    if (env->ExceptionCheck()) {

        return NULL;

        return NULL;

    }

    }