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

Commit d4e38524 authored by Dimitry Ivanov's avatar Dimitry Ivanov
Browse files

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

Change-Id: Ia658c3dfd2cc5f19977ae48d9a3d543dd6faa01a
parents 8d3f5c39 1a3ac02e

libnativeloader/native_loader.cpp

+6 −1
Original line number Diff line number Diff line
@@ -56,7 +56,12 @@ class LibraryNamespaces { 
                              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) {