commit 08502f8636ac07ab4346b4fc58d820f63647441e
author Dimitry Ivanov <dimitry@google.com> Mon May 09 12:58:54 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Mon May 09 12:58:54 2016 -0700
tree 22ce40c4ea4e69d77a6475f043557a70993f3b3b
parent bc0afda3d4b2b70a31c9b7ae090b51483547d157
parent c0a65a794e2061cac9422cc87060aec4fd9748a6

resolve merge conflicts of 1a3ac02 to nyc-dev-plus-aosp

Change-Id: Ia658c3dfd2cc5f19977ae48d9a3d543dd6faa01a

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 7abc2c3..5c1db5b 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -56,7 +56,12 @@
                               jstring java_library_path,
                               jstring java_permitted_path,
                               int32_t target_sdk_version) {
-    ScopedUtfChars library_path(env, java_library_path);
+    std::string library_path; // empty string by default.
+
+    if (java_library_path != nullptr) {
+      ScopedUtfChars library_path_utf_chars(env, java_library_path);
+      library_path = library_path_utf_chars.c_str();
+    }
 
     std::string permitted_path;
     if (java_permitted_path != nullptr) {