drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '3038046b23540ccf4ca80f181386a77cf64d5e27':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
This commit is contained in:
Brian Carlstrom
2014-01-30 14:11:02 -08:00
committed by Android Git Automerger
parent 70986e197b 3038046b23
commit 2cd0563cb8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/ProcessStats.java
View File

@ -1046,7 +1046,7 @@ public final class ProcessStats implements Parcelable {
public boolean evaluateSystemProperties(boolean update) { public boolean evaluateSystemProperties(boolean update) {
boolean changed = false; 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()); VMRuntime.getRuntime().vmLibrary());
if (!Objects.equals(runtime, mRuntime)) { if (!Objects.equals(runtime, mRuntime)) {
changed = true; changed = true;

2
services/java/com/android/server/SystemServer.java
View File

@ -1133,7 +1133,7 @@ public class SystemServer {
* running as root and we need to be the system user to set * running as root and we need to be the system user to set
* the property. http://b/11463182 * the property. http://b/11463182
*/ */
SystemProperties.set("persist.sys.dalvik.vm.lib", SystemProperties.set("persist.sys.dalvik.vm.lib.1",
VMRuntime.getRuntime().vmLibrary()); VMRuntime.getRuntime().vmLibrary());
if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) { if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) {