From 5637ffced9d0b804f43db0915b2d0f39af2835c0 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Fri, 1 Nov 2013 14:51:58 -0700 Subject: Move set of persist.sys.dalvik.vm.lib to SystemServer only Bug: 11463182 Bug: 11479647 Change-Id: I38efdecdd65fe3efc9c33b4dc204a64543ae6377 --- services/java/com/android/server/SystemServer.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'services') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 0e0f156..bb14259 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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 -- cgit v1.1