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

Commit 097ff245 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by android-build-merger
Browse files

Merge "Relax namespace restriction on system server classloader" am: a8135325 

am: 3c6b4961

Change-Id: I60ab1b74e82a11da485e30a7ea5e45e49c5498c9
parents 28369279 3c6b4961

core/java/com/android/internal/os/ZygoteInit.java

+3 −3
Original line number Diff line number Diff line
@@ -560,11 +560,11 @@ public class ZygoteInit { 
     */

    private static PathClassLoader createSystemServerClassLoader(String systemServerClasspath,

                                                                 int targetSdkVersion) {

      String librarySearchPath = System.getProperty("java.library.path");

      String libraryPath = System.getProperty("java.library.path");



      return PathClassLoaderFactory.createClassLoader(systemServerClasspath,

                                                      librarySearchPath,

                                                      null /* libraryPermittedPath */,

                                                      libraryPath,

                                                      libraryPath,

                                                      ClassLoader.getSystemClassLoader(),

                                                      targetSdkVersion,

                                                      true /* isNamespaceShared */);