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

Commit 5bcd758d authored by Brian Carlstrom's avatar Brian Carlstrom Committed by The Android Automerger
Browse files

Move set of persist.sys.dalvik.vm.lib to SystemServer only 

Bug: 11463182
Bug: 11479647
Change-Id: I38efdecdd65fe3efc9c33b4dc204a64543ae6377
parent 9774612b

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

+0 −12
Original line number Diff line number Diff line
@@ -103,18 +103,6 @@ public class RuntimeInit { 
        /* set default handler; this applies to all threads in the VM */

        Thread.setDefaultUncaughtExceptionHandler(new UncaughtHandler());



        /*

         * In case the runtime switched since last boot (such as when

         * the old runtime was removed in an OTA), set the system

         * property so that it is in sync. We can't do this in

         * libnativehelper's JniInvocation::Init code where we already

         * had to fallback to a different runtime because it is

         * running as root and we need to be the system user to set

         * the property. http://b/11463182

         */

        SystemProperties.set("persist.sys.dalvik.vm.lib",

                             VMRuntime.getRuntime().vmLibrary());



        /*

         * Install a TimezoneGetter subclass for ZoneInfo.db

         */

services/java/com/android/server/SystemServer.java

+13 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,19 @@ public class SystemServer { 
    private static native void nativeInit();



    public static void main(String[] args) {



        /*

         * In case the runtime switched since last boot (such as when

         * the old runtime was removed in an OTA), set the system

         * property so that it is in sync. We can't do this in

         * libnativehelper's JniInvocation::Init code where we already

         * had to fallback to a different runtime because it is

         * running as root and we need to be the system user to set

         * the property. http://b/11463182

         */

        SystemProperties.set("persist.sys.dalvik.vm.lib",

                             VMRuntime.getRuntime().vmLibrary());



        if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) {

            // If a device's clock is before 1970 (before 0), a lot of

            // APIs crash dealing with negative numbers, notably