am d26d20fe: am 71b379df: Merge "Use GetStringUTFRegion" into jb-mr1-dev

* commit 'd26d20fe225bb2ac70ea184af8e85fb995f44a68':
  Use GetStringUTFRegion

1 files changed, 1 insertions, 4 deletions

diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
index a01ac3780..f9b23f06d 100644
--- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
+++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
@@ -29,18 +29,15 @@ static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jobject object,
         jint keyCount, jintArray keyXCoordinates, jintArray keyYCoordinates,
         jintArray keyWidths, jintArray keyHeights, jintArray keyCharCodes,
         jfloatArray sweetSpotCenterXs, jfloatArray sweetSpotCenterYs, jfloatArray sweetSpotRadii) {
-    const char *localeCStr = env->GetStringUTFChars(localeJStr, 0);
-    ProximityInfo *proximityInfo = new ProximityInfo(env, localeCStr, maxProximityCharsSize,
+    ProximityInfo *proximityInfo = new ProximityInfo(env, localeJStr, maxProximityCharsSize,
             displayWidth, displayHeight, gridWidth, gridHeight, mostCommonkeyWidth, proximityChars,
             keyCount, keyXCoordinates, keyYCoordinates, keyWidths, keyHeights, keyCharCodes,
             sweetSpotCenterXs, sweetSpotCenterYs, sweetSpotRadii);
-    env->ReleaseStringUTFChars(localeJStr, localeCStr);
     return reinterpret_cast<jlong>(proximityInfo);
 }
 
 static void latinime_Keyboard_release(JNIEnv *env, jobject object, jlong proximityInfo) {
     ProximityInfo *pi = reinterpret_cast<ProximityInfo*>(proximityInfo);
-    if (!pi) return;
     delete pi;
 }