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

Commit 3930a42d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Debug.isVmapStack reads kernel configs only" into rvc-dev am: 3c706cfc am: 028a7d16 

Change-Id: Idd99b9e076c747033abb5b6e4cb7d26d65688471
parents f61717ca 028a7d16

core/jni/android_os_Debug.cpp

+5 −2
Original line number Diff line number Diff line
@@ -853,8 +853,11 @@ static jboolean android_os_Debug_isVmapStack(JNIEnv *env, jobject clazz) 
    } cfg_state = CONFIG_UNKNOWN;



    if (cfg_state == CONFIG_UNKNOWN) {

        const std::map<std::string, std::string> configs =

            vintf::VintfObject::GetInstance()->getRuntimeInfo()->kernelConfigs();

        auto runtime_info = vintf::VintfObject::GetInstance()

                                    ->getRuntimeInfo(false /* skip cache */,

                                                     vintf::RuntimeInfo::FetchFlag::CONFIG_GZ);

        CHECK(runtime_info != nullptr) << "Kernel configs cannot be fetched. b/151092221";

        const std::map<std::string, std::string>& configs = runtime_info->kernelConfigs();

        std::map<std::string, std::string>::const_iterator it = configs.find("CONFIG_VMAP_STACK");

        cfg_state = (it != configs.end() && it->second == "y") ? CONFIG_SET : CONFIG_UNSET;

    }