commit 0f1b9535eeb7ce59564aa9f3cfd19510b2ecd250
author Slava Shklyaev <slavash@google.com> Wed Apr 17 10:43:34 2019 +0100
committer Slava Shklyaev <slavash@google.com> Wed Apr 17 09:45:20 2019 +0000
tree 52bbe1cbe5fda7a0f31180a525ebba72636d7b7e
parent 55ea641308f335b0e145408c5b8a374c08dad932

Fix crash on eng builds

Bug: 130668806
Test: mma
Change-Id: I4dd0d51f7c9b86772912d05b2cb04203f50cf2b2

jni/benchmark_jni.cpp

diff --git a/jni/benchmark_jni.cpp b/jni/benchmark_jni.cpp
index ba97efd..f39397c 100644
--- a/jni/benchmark_jni.cpp
+++ b/jni/benchmark_jni.cpp
@@ -39,12 +39,17 @@
         jboolean _enableIntermediateTensorsDump,
         jstring _nnApiDeviceName) {
     const char *modelFileName = env->GetStringUTFChars(_modelFileName, NULL);
-    const char *nnApiDeviceName = env->GetStringUTFChars(_nnApiDeviceName, NULL);
+    const char *nnApiDeviceName =
+        _nnApiDeviceName == NULL
+            ? NULL
+            : env->GetStringUTFChars(_nnApiDeviceName, NULL);
     void *handle =
         BenchmarkModel::create(modelFileName, _useNnApi,
                                _enableIntermediateTensorsDump, nnApiDeviceName);
     env->ReleaseStringUTFChars(_modelFileName, modelFileName);
-    env->ReleaseStringUTFChars(_nnApiDeviceName, nnApiDeviceName);
+    if (_nnApiDeviceName != NULL) {
+        env->ReleaseStringUTFChars(_nnApiDeviceName, nnApiDeviceName);
+    }
 
     return (jlong)(uintptr_t)handle;
 }