diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-11-01 14:51:58 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2013-11-05 13:49:25 -0800 |
| commit | 5bcd758d6ba6a46bd35a04518f4ba0c3c7bb2242 (patch) | |
| tree | 3e9f44f909301de41451b6718bfea61efb7610c7 | |
| parent | 9774612b57f08afa9f178ba1d89d9b95dd32d85e (diff) | |
| download | base-5bcd758d6ba6a46bd35a04518f4ba0c3c7bb2242.tar.gz | |
Move set of persist.sys.dalvik.vm.lib to SystemServer onlyandroid-4.4_r1.1.0.1android-4.4_r1.1
Bug: 11463182
Bug: 11479647
Change-Id: I38efdecdd65fe3efc9c33b4dc204a64543ae6377
| -rw-r--r-- | core/java/com/android/internal/os/RuntimeInit.java | 12 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index 69b593a6fb56..5538dca2a4fa 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -104,18 +104,6 @@ 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() { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 0e0f15625823..bb1425952c1c 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 |