Merge "Don't use LOG() in code that runs post-fork." am: c1476aae0b am: efd896cc29 (1b3e75a5) · Commits · e / os / platform_frameworks_native

cmds/installd/dexopt.cpp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1371,10 +1371,12 @@ static SecondaryDexAccess check_secondary_dex_access(const std::string& dex_path
	return kSecondaryDexAccessReadOk;		return kSecondaryDexAccessReadOk;
	} else {		} else {
	if (errno == ENOENT) {		if (errno == ENOENT) {
	LOG(INFO) << "Secondary dex does not exist: " << dex_path;		async_safe_format_log(ANDROID_LOG_INFO, LOG_TAG,
			"Secondary dex does not exist: %s", dex_path.c_str());
	return kSecondaryDexAccessDoesNotExist;		return kSecondaryDexAccessDoesNotExist;
	} else {		} else {
	PLOG(ERROR) << "Could not access secondary dex " << dex_path;		async_safe_format_log(ANDROID_LOG_ERROR, LOG_TAG,
			"Could not access secondary dex: %s (%d)", dex_path.c_str(), errno);
	return errno == EACCES		return errno == EACCES
	? kSecondaryDexAccessPermissionError		? kSecondaryDexAccessPermissionError
	: kSecondaryDexAccessIOError;		: kSecondaryDexAccessIOError;