diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-28 16:10:53 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-28 16:10:53 -0700 |
| commit | 77b170cedca2828d8c40ca33b820f5911a558326 (patch) | |
| tree | a3c525c0bdd9c33756d6ff997730d1b3356dc5e0 /core | |
| parent | a487fb77dff1a86fbd160694de41e32b74f10cb1 (diff) | |
| parent | 452c592191a147ae1175db775bc3e7e8e0311855 (diff) | |
| download | frameworks_base-77b170cedca2828d8c40ca33b820f5911a558326.zip frameworks_base-77b170cedca2828d8c40ca33b820f5911a558326.tar.gz frameworks_base-77b170cedca2828d8c40ca33b820f5911a558326.tar.bz2 | |
resolved conflicts for merge of 452c5921 to klp-modular-dev-plus-aosp
Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/app/ProcessStats.java | 2 | ||||
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java index a87992a..cd90cdb 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; diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index fc6cc81..78885d2 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -778,7 +778,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) } // libart tolerates libdvm flags, but not vice versa, so only pass some options if libart. - property_get("persist.sys.dalvik.vm.lib.1", dalvikVmLibBuf, "libdvm.so"); + property_get("persist.sys.dalvik.vm.lib.2", dalvikVmLibBuf, "libart.so"); bool libart = (strncmp(dalvikVmLibBuf, "libart", 6) == 0); if (libart) { |