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

Commit 7baf5a8d authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Use the boot class loader as parent of system server loader."

parents 6227b441 5d1814e1

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

+4 −2
Original line number Diff line number Diff line
@@ -536,9 +536,11 @@ public class ZygoteInit { 
    static ClassLoader createPathClassLoader(String classPath, int targetSdkVersion) {

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



        // We use the boot class loader, that's what the runtime expects at AOT.

        ClassLoader parent = ClassLoader.getSystemClassLoader().getParent();



        return ClassLoaderFactory.createClassLoader(classPath, libraryPath, libraryPath,

                ClassLoader.getSystemClassLoader(), targetSdkVersion, true /* isNamespaceShared */,

                null /* classLoaderName */);

                parent, targetSdkVersion, true /* isNamespaceShared */, null /* classLoaderName */);

    }



    /**