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

Commit dfd1aa43 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp 

Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2
parents 5cdbac1e 2cd0563c

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/SystemServer.java

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