Snap for 5591509 from 9b77c0ba32b35e71ef0dc918b23fc7a438044c1f to qt-release (1542b561) · Commits · e / os / android_system_core

fastboot/fastboot.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -1177,6 +1177,10 @@ static void reboot_to_userspace_fastboot() {
		if (!is_userspace_fastboot()) {
		die("Failed to boot into userspace fastboot; one or more components might be unbootable.");
		}

		// Reset target_sparse_limit after reboot to userspace fastboot. Max
		// download sizes may differ in bootloader and fastbootd.
		target_sparse_limit = -1;
		}

		class ImageSource {

+8 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,13 @@ bool CgroupController::HasValue() const {
		return controller_ != nullptr;
		}

		bool CgroupController::IsUsable() const {
		if (!HasValue()) return false;

		uint32_t flags = ACgroupController_getFlags(controller_);
		return (flags & CGROUPRC_CONTROLLER_FLAG_MOUNTED) != 0;
		}

		std::string CgroupController::GetTasksFilePath(const std::string& rel_path) const {
		std::string tasks_path = path();

		@@ -153,6 +160,7 @@ void CgroupMap::Print() const {
		const ACgroupController* controller = ACgroupFile_getController(i);
		LOG(INFO) << "\t" << ACgroupController_getName(controller) << " ver "
		<< ACgroupController_getVersion(controller) << " path "
		<< ACgroupController_getFlags(controller) << " flags "
		<< ACgroupController_getPath(controller);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ class CgroupController {
		const char* path() const;

		bool HasValue() const;
		bool IsUsable() const;

		std::string GetTasksFilePath(const std::string& path) const;
		std::string GetProcsFilePath(const std::string& path, uid_t uid, pid_t pid) const;

+3 −3

Original line number	Diff line number	Diff line
		@@ -42,19 +42,19 @@ cc_library {
		"libcgrouprc_format",
		],
		stubs: {
		symbol_file: "libcgrouprc.map.txt",
		symbol_file: "libcgrouprc.llndk.txt",
		versions: ["29"],
		},
		target: {
		linux: {
		version_script: "libcgrouprc.map.txt",
		version_script: "libcgrouprc.llndk.txt",
		},
		},
		}

		llndk_library {
		name: "libcgrouprc",
		symbol_file: "libcgrouprc.map.txt",
		symbol_file: "libcgrouprc.llndk.txt",
		export_include_dirs: [
		"include",
		],

+5 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,11 @@ uint32_t ACgroupController_getVersion(const ACgroupController* controller) {
		return controller->version();
		}

		uint32_t ACgroupController_getFlags(const ACgroupController* controller) {
		CHECK(controller != nullptr);
		return controller->flags();
		}

		const char* ACgroupController_getName(const ACgroupController* controller) {
		CHECK(controller != nullptr);
		return controller->name();