diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-31 12:57:24 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-01-31 12:57:24 +0000 |
| commit | dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd (patch) | |
| tree | 45dfe497ada812655fd55230dc7c8f65abfdc868 | |
| parent | 5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72 (diff) | |
| parent | 2cd0563cb8345747d3705d4f339a0800998767fe (diff) | |
resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp
Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2
| -rw-r--r-- | core/java/com/android/internal/app/ProcessStats.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/SystemServer.java | 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 0cad33cff6b8..a87992aeb341 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", + String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib.1", VMRuntime.getRuntime().vmLibrary()); if (!Objects.equals(runtime, mRuntime)) { changed = true; diff --git a/services/core/java/com/android/server/SystemServer.java b/services/core/java/com/android/server/SystemServer.java index 6a7638856177..c22170cb0fed 100644 --- a/services/core/java/com/android/server/SystemServer.java +++ b/services/core/java/com/android/server/SystemServer.java @@ -165,7 +165,7 @@ public final class SystemServer { // 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()) { |