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

Commit 68724352 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 3a9a2089: am e6411e68: Merge "Set persist.sys.dalvik.vm.lib at system...

am 3a9a2089: am e6411e68: Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev

* commit '3a9a2089':
  Set persist.sys.dalvik.vm.lib at system server startup
parents b9c28ce9 3a9a2089
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -103,6 +103,18 @@ 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
         */