summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-11-01 22:51:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-01 22:51:07 +0000
commita51052d17cf94fcddb5739141132fb9dee75bffb (patch)
tree563d8b5c2c10236185aae6debfc2c7fa2feafcb9 /services
parent371427b53c70d1a71012de404c29187fe303a22a (diff)
parent5637ffced9d0b804f43db0915b2d0f39af2835c0 (diff)
downloadframeworks_base-a51052d17cf94fcddb5739141132fb9dee75bffb.zip
frameworks_base-a51052d17cf94fcddb5739141132fb9dee75bffb.tar.gz
frameworks_base-a51052d17cf94fcddb5739141132fb9dee75bffb.tar.bz2
Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/SystemServer.java13
1 files changed, 13 insertions, 0 deletions
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