Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad am: 43fd84a03c (e556f11b) · Commits · e / os / android_frameworks_base

core/jni/android_view_InputChannel.cpp

+5 −4

Original line number	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,
		NativeInputChannel* nativeInputChannel) {
		std::unique_ptr<NativeInputChannel> nativeInputChannel) {
		jobject inputChannelObj = env->NewObject(gInputChannelClassInfo.clazz,
		gInputChannelClassInfo.ctor);
		if (inputChannelObj) {
		android_view_InputChannel_setNativeInputChannel(env, inputChannelObj, nativeInputChannel);
		android_view_InputChannel_setNativeInputChannel(env, inputChannelObj,
		nativeInputChannel.release());
		}
		return inputChannelObj;
		}
		@@ -143,13 +144,13 @@ static jobjectArray android_view_InputChannel_nativeOpenInputChannelPair(JNIEnv*
		}

		jobject serverChannelObj = android_view_InputChannel_createInputChannel(env,
		new NativeInputChannel(serverChannel));
		std::make_unique<NativeInputChannel>(serverChannel));
		if (env->ExceptionCheck()) {
		return NULL;
		}

		jobject clientChannelObj = android_view_InputChannel_createInputChannel(env,
		new NativeInputChannel(clientChannel));
		std::make_unique<NativeInputChannel>(clientChannel));
		if (env->ExceptionCheck()) {
		return NULL;
		}