From ad464053582bfdc6764aa3f98bc2c00c1ac082e9 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Thu, 31 Oct 2013 14:56:54 -0700 Subject: [PATCH] Set persist.sys.dalvik.vm.lib at system server startup Bug: 11463182 Change-Id: I4409e84570c4e27bf8da36d0aca87812a1c032a6 --- core/java/com/android/internal/os/RuntimeInit.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index 5538dca2a4faa..69b593a6fb56d 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -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 */