Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a76be8ba authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

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

parents 3040f735 fdb98d47

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

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,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/core/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,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()) {