commit 5f2563c05dc0f265e502bcea60e0f122c9695342
author Michael Wright <michaelwr@google.com> Tue May 17 17:18:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 17 17:18:49 2016 +0000
tree b82f7ef93087b9ae3d79dbe2ed1393098b5d2fbc
parent f29876797e1efc2c9202f47a60ca23c5dbe6398f
parent 60d68715581bb597dfbc32e1fabdb1cab36c592c

Merge "Fix strstr16." into nyc-dev

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 488608a..44f17cd 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -101,9 +101,7 @@
                                   nullptr,
                                   library_path.c_str(),
                                   namespace_type,
-                                  !permitted_path.empty() ?
-                                      permitted_path.c_str() :
-                                      nullptr);
+                                  permitted_path.c_str());
 
     if (ns != nullptr) {
       namespaces_.push_back(std::make_pair(env->NewWeakGlobalRef(class_loader), ns));