Merge "Fix missing Release for GetStringUTFChars calls." into tm-dev (6ccdee38) · Commits · e / os / android_frameworks_base

core/jni/android_content_res_ApkAssets.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -459,8 +459,12 @@ static jobject NativeGetOverlayableInfo(JNIEnv* env, jclass /clazz/, jlong ptr
		return nullptr;
		}

		auto overlayable_name_native = std::string(env->GetStringUTFChars(overlayable_name, NULL));
		const char* overlayable_name_native = env->GetStringUTFChars(overlayable_name, nullptr);
		if (overlayable_name_native == nullptr) {
		return nullptr;
		}
		auto actor = overlayable_map.find(overlayable_name_native);
		env->ReleaseStringUTFChars(overlayable_name, overlayable_name_native);
		if (actor == overlayable_map.end()) {
		return nullptr;
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@

		#include <jni.h>
		#include <nativehelper/JNIHelp.h>
		#include <nativehelper/ScopedUtfChars.h>

		using namespace android;
		using namespace img_utils;
		@@ -1264,16 +1265,14 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt

		sp<NativeContext> nativeContext = new NativeContext(characteristics, results);

		const char* captureTime = env->GetStringUTFChars(formattedCaptureTime, nullptr);

		size_t len = strlen(captureTime) + 1;
		if (len != NativeContext::DATETIME_COUNT) {
		ScopedUtfChars captureTime(env, formattedCaptureTime);
		if (captureTime.size() + 1 != NativeContext::DATETIME_COUNT) {
		jniThrowException(env, "java/lang/IllegalArgumentException",
		"Formatted capture time string length is not required 20 characters");
		return;
		}

		nativeContext->setCaptureTime(String8(captureTime));
		nativeContext->setCaptureTime(String8(captureTime.c_str()));

		DngCreator_setNativeContext(env, thiz, nativeContext);
		}