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

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

@@ -1046,7 +1046,7 @@ public final class ProcessStats implements Parcelable {
 
     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/java/com/android/server/SystemServer.java

@@ -1133,7 +1133,7 @@ public class SystemServer {
          * 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",
+        SystemProperties.set("persist.sys.dalvik.vm.lib.1",
                              VMRuntime.getRuntime().vmLibrary());
 
         if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) {