Merge "Handle empty strings in GetPartitionAbsolutePath." (ffa89de4) · Commits · e / os / android_system_core

fs_mgr/liblp/partition_opener.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <unistd.h>

		#include <android-base/file.h>
		#include <android-base/strings.h>

		#include "utility.h"

		@@ -37,7 +38,7 @@ using android::base::unique_fd;
		namespace {

		std::string GetPartitionAbsolutePath(const std::string& path) {
		if (path[0] == '/') {
		if (android::base::StartsWith(path, "/")) {
		return path;
		}
		return "/dev/block/by-name/" + path;