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

Commit 1a3ac02e authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by android-build-merger
Browse files

Merge "nativeloader: Fix the case of search_path == null" 

am: 179fea40

* commit '179fea40':
  nativeloader: Fix the case of search_path == null

Change-Id: Idb502568c161693877c30bb7cd085e974433aa8f
parents a76e171b 179fea40

libnativeloader/native_loader.cpp

+6 −1
Original line number Diff line number Diff line
@@ -54,7 +54,12 @@ class LibraryNamespaces { 
                              bool is_shared,

                              jstring java_library_path,

                              jstring java_permitted_path) {

    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) {