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

Commit e94bbb37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix missing Release for GetStringUTFChars calls." into tm-dev am: 6ccdee38 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17917124



Change-Id: Ia527c755a6a65a24b71f06d858f5f1221c014aff
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1837e9ec 6ccdee38

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;

  }

core/jni/android_hardware_camera2_DngCreator.cpp

+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);

}