diff options
author | Brian Carlstrom <bdc@google.com> | 2013-10-31 14:56:54 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2013-10-31 15:29:40 -0700 |
commit | ad464053582bfdc6764aa3f98bc2c00c1ac082e9 (patch) | |
tree | 87a53de301bb34b4024336ef6e43e8e469237fb6 /core/java/com | |
parent | 43ef1c8c34c6dd7c7ae75ac2c1b9bfdc15405b04 (diff) | |
download | frameworks_base-ad464053582bfdc6764aa3f98bc2c00c1ac082e9.zip frameworks_base-ad464053582bfdc6764aa3f98bc2c00c1ac082e9.tar.gz frameworks_base-ad464053582bfdc6764aa3f98bc2c00c1ac082e9.tar.bz2 |
Set persist.sys.dalvik.vm.lib at system server startup
Bug: 11463182
Change-Id: I4409e84570c4e27bf8da36d0aca87812a1c032a6
Diffstat (limited to 'core/java/com')
-rw-r--r-- | core/java/com/android/internal/os/RuntimeInit.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index 5538dca..69b593a 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -104,6 +104,18 @@ public class RuntimeInit { 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 */ TimezoneGetter.setInstance(new TimezoneGetter() { |