ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "nativeloader: Ignore empty java_permitted_path" into nyc-dev

Browse source 
am: 6edd0c3a68

* commit '6edd0c3a68f60541c31fd65080e52939f2be3bc2':
  nativeloader: Ignore empty java_permitted_path

Change-Id: I82e39b78ac4ba67018a2d78c24b77ace01a6f2e8
This commit is contained in:
Dimitry Ivanov 2016-05-11 05:03:07 +00:00 • committed by android-build-merger
commit bd8c47e2d4
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnativeloader/native_loader.cpp
View file

@ -78,7 +78,9 @@ class LibraryNamespaces {
if (java_permitted_path != nullptr) { if (java_permitted_path != nullptr) {
ScopedUtfChars path(env, java_permitted_path); ScopedUtfChars path(env, java_permitted_path);
permitted_path = permitted_path + ":" + path.c_str(); if (path.c_str() != nullptr && path.size() > 0) {
permitted_path = permitted_path + ":" + path.c_str();
}
} }
if (!initialized_ && !InitPublicNamespace(library_path.c_str(), target_sdk_version)) { if (!initialized_ && !InitPublicNamespace(library_path.c_str(), target_sdk_version)) {