commit a76be8ba7ac14092669c981e76f07f97d2c3f386
author Brian Carlstrom <bdc@google.com> Fri Jan 31 00:21:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 31 00:21:16 2014 +0000
tree e95db1fb27a5dd041b7460f2f9f68e7804599fc6
parent 3040f7354106dbc2a43b0ca21de25811f0d4057d
parent fdb98d477047f6dfdbd9e94a7b326d35ad78c6c8

Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"

core/java/com/android/internal/app/ProcessStats.java

diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java
index eda1db2..4dd4a45 100644
--- a/core/java/com/android/internal/app/ProcessStats.java
+++ b/core/java/com/android/internal/app/ProcessStats.java
@@ -1097,7 +1097,7 @@
 
     public boolean evaluateSystemProperties(boolean update) {
         boolean changed = false;
-        String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib",
+        String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib.1",
                 VMRuntime.getRuntime().vmLibrary());
         if (!Objects.equals(runtime, mRuntime)) {
             changed = true;

services/core/java/com/android/server/SystemServer.java

diff --git a/services/core/java/com/android/server/SystemServer.java b/services/core/java/com/android/server/SystemServer.java
index b04fc15..1f6235f 100644
--- a/services/core/java/com/android/server/SystemServer.java
+++ b/services/core/java/com/android/server/SystemServer.java
@@ -163,7 +163,7 @@
         // 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());
+        SystemProperties.set("persist.sys.dalvik.vm.lib.1", VMRuntime.getRuntime().vmLibrary());
 
         // Enable the sampling profiler.
         if (SamplingProfilerIntegration.isEnabled()) {