summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-28 22:31:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-28 22:31:39 +0000
commit452c592191a147ae1175db775bc3e7e8e0311855 (patch)
tree49d3f9b47135cf0eb108b1539de5a42e6a386761 /core/java/com
parentdf0e9ed5536e2cab860f3ecf9dab0030a471766e (diff)
parent197565e0e800be3c731e679914f40afa1aab98fd (diff)
downloadframeworks_base-452c592191a147ae1175db775bc3e7e8e0311855.zip
frameworks_base-452c592191a147ae1175db775bc3e7e8e0311855.tar.gz
frameworks_base-452c592191a147ae1175db775bc3e7e8e0311855.tar.bz2
am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '197565e0e800be3c731e679914f40afa1aab98fd': Move to dalvik.vm.lib.2 to force default to libart
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/app/ProcessStats.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java
index a13a1cb..101fba9 100644
--- a/core/java/com/android/internal/app/ProcessStats.java
+++ b/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.1",
+ String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib.2",
VMRuntime.getRuntime().vmLibrary());
if (!Objects.equals(runtime, mRuntime)) {
changed = true;