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

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

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

Merge "Relax namespace restriction on system server classloader" am: a8135325 am: 3c6b4961 am: 097ff245
am: 629ad7e3

Change-Id: I04ed9be5bb8167fd5ed41f7d120e7c25194aec97
parents a11343d3 629ad7e3

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

+3 −3
Original line number Diff line number Diff line
@@ -476,11 +476,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 */);