Merge "Debug.isVmapStack reads kernel configs only" into rvc-dev am:... (2a0231b5) · Commits · e / os / android_frameworks_base

core/jni/android_os_Debug.cpp

+5 −2

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

	if (cfg_state == CONFIG_UNKNOWN) {		if (cfg_state == CONFIG_UNKNOWN) {
	const std::map<std::string, std::string> configs =		auto runtime_info = vintf::VintfObject::GetInstance()
	vintf::VintfObject::GetInstance()->getRuntimeInfo()->kernelConfigs();		->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");		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;		cfg_state = (it != configs.end() && it->second == "y") ? CONFIG_SET : CONFIG_UNSET;
	}		}