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

Commit f990f7d2 authored by David Sehr's avatar David Sehr Committed by android-build-merger
Browse files

Merge "Add system option to disable lock profiling" into qt-dev am: 10d9320c 

am: 883b12f4

Change-Id: I02ec8d04bec059f82e87dcb7b5b04493818cb7df
parents 4407efe7 883b12f4

core/jni/AndroidRuntime.cpp

+16 −0
Original line number Diff line number Diff line
@@ -250,6 +250,11 @@ static const char* ENABLE_APEX_IMAGE = "enable_apex_image"; 
// Flag to pass to the runtime when using the apex image.

static const char* kApexImageOption = "-Ximage:/system/framework/apex.art";



// Feature flag name for disabling lock profiling.

static const char* DISABLE_LOCK_PROFILING = "disable_lock_profiling";

// Runtime option disabling lock profiling.

static const char* kLockProfThresholdRuntimeOption = "-Xlockprofthreshold:0";



static AndroidRuntime* gCurRuntime = NULL;



/*
@@ -698,6 +703,17 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
        ALOGI("Using default boot image");

    }



    std::string disable_lock_profiling =

        server_configurable_flags::GetServerConfigurableFlag(RUNTIME_NATIVE_BOOT_NAMESPACE,

                                                             DISABLE_LOCK_PROFILING,

                                                             /*default_value=*/ "");

    if (disable_lock_profiling == "true") {

        addOption(kLockProfThresholdRuntimeOption);

        ALOGI("Disabling lock profiling: '%s'\n", kLockProfThresholdRuntimeOption);

    } else {

        ALOGI("Leaving lock profiling enabled");

    }



    bool checkJni = false;

    property_get("dalvik.vm.checkjni", propBuf, "");

    if (strcmp(propBuf, "true") == 0) {