Merge "Dependency injection of AssetProviders into ApkAssets" into sc-dev am: e10c0c05b1 (526ab171) · Commits · e / os / android_frameworks_base

core/jni/android_content_res_ApkAssets.cpp

+65 −29

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ static struct assetfiledescriptor_offsets_t {
		static struct assetsprovider_offsets_t {
		jclass classObject;
		jmethodID loadAssetFd;
		jmethodID toString;
		} gAssetsProviderOffsets;

		static struct {
		@@ -72,9 +73,22 @@ enum : format_type_t {
		class LoaderAssetsProvider : public AssetsProvider {
		public:
		static std::unique_ptr<AssetsProvider> Create(JNIEnv* env, jobject assets_provider) {
		return (!assets_provider) ? nullptr
		return (!assets_provider) ? EmptyAssetsProvider::Create()
		: std::unique_ptr<AssetsProvider>(new LoaderAssetsProvider(
		env->NewGlobalRef(assets_provider)));
		env, assets_provider));
		}

		bool ForEachFile(const std::string& /* root_path */,
		const std::function<void(const StringPiece&, FileType)>& /* f */) const {
		return true;
		}

		const std::string& GetDebugName() const override {
		return debug_name_;
		}

		bool IsUpToDate() const override {
		return true;
		}

		~LoaderAssetsProvider() override {
		@@ -142,7 +156,7 @@ class LoaderAssetsProvider : public AssetsProvider {
		*file_exists = true;
		}

		return ApkAssets::CreateAssetFromFd(base::unique_fd(fd),
		return AssetsProvider::CreateAssetFromFd(base::unique_fd(fd),
		nullptr /* path */,
		static_cast<off64_t>(mOffset),
		static_cast<off64_t>(mLength));
		@@ -151,11 +165,17 @@ class LoaderAssetsProvider : public AssetsProvider {
		private:
		DISALLOW_COPY_AND_ASSIGN(LoaderAssetsProvider);

		explicit LoaderAssetsProvider(jobject assets_provider)
		: assets_provider_(assets_provider) { }
		explicit LoaderAssetsProvider(JNIEnv* env, jobject assets_provider) {
		assets_provider_ = env->NewGlobalRef(assets_provider);
		auto string_result = static_cast<jstring>(env->CallObjectMethod(
		assets_provider_, gAssetsProviderOffsets.toString));
		ScopedUtfChars str(env, string_result);
		debug_name_ = std::string(str.c_str(), str.size());
		}

		// The global reference to the AssetsProvider
		jobject assets_provider_;
		std::string debug_name_;
		};

		static jlong NativeLoad(JNIEnv* env, jclass /clazz/, const format_type_t format,
		@@ -170,18 +190,26 @@ static jlong NativeLoad(JNIEnv* env, jclass /clazz/, const format_type_t forma
		auto loader_assets = LoaderAssetsProvider::Create(env, assets_provider);
		std::unique_ptr<const ApkAssets> apk_assets;
		switch (format) {
		case FORMAT_APK:
		apk_assets = ApkAssets::Load(path.c_str(), property_flags, std::move(loader_assets));
		case FORMAT_APK: {
		auto assets = MultiAssetsProvider::Create(std::move(loader_assets),
		ZipAssetsProvider::Create(path.c_str()));
		apk_assets = ApkAssets::Load(std::move(assets), property_flags);
		break;
		}
		case FORMAT_IDMAP:
		apk_assets = ApkAssets::LoadOverlay(path.c_str(), property_flags);
		break;
		case FORMAT_ARSC:
		apk_assets = ApkAssets::LoadTable(path.c_str(), property_flags, std::move(loader_assets));
		apk_assets = ApkAssets::LoadTable(AssetsProvider::CreateAssetFromFile(path.c_str()),
		std::move(loader_assets),
		property_flags);
		break;
		case FORMAT_DIRECTORY:
		apk_assets = ApkAssets::LoadFromDir(path.c_str(), property_flags, std::move(loader_assets));
		case FORMAT_DIRECTORY: {
		auto assets = MultiAssetsProvider::Create(std::move(loader_assets),
		DirectoryAssetsProvider::Create(path.c_str()));
		apk_assets = ApkAssets::Load(std::move(assets), property_flags);
		break;
		}
		default:
		const std::string error_msg = base::StringPrintf("Unsupported format type %d", format);
		jniThrowException(env, "java/lang/IllegalArgumentException", error_msg.c_str());
		@@ -221,13 +249,17 @@ static jlong NativeLoadFromFd(JNIEnv* env, jclass /clazz/, const format_type_t
		auto loader_assets = LoaderAssetsProvider::Create(env, assets_provider);
		std::unique_ptr<const ApkAssets> apk_assets;
		switch (format) {
		case FORMAT_APK:
		apk_assets = ApkAssets::LoadFromFd(std::move(dup_fd), friendly_name_utf8.c_str(),
		property_flags, std::move(loader_assets));
		case FORMAT_APK: {
		auto assets = MultiAssetsProvider::Create(
		std::move(loader_assets),
		ZipAssetsProvider::Create(std::move(dup_fd), friendly_name_utf8.c_str()));
		apk_assets = ApkAssets::Load(std::move(assets), property_flags);
		break;
		}
		case FORMAT_ARSC:
		apk_assets = ApkAssets::LoadTableFromFd(std::move(dup_fd), friendly_name_utf8.c_str(),
		property_flags, std::move(loader_assets));
		apk_assets = ApkAssets::LoadTable(
		AssetsProvider::CreateAssetFromFd(std::move(dup_fd), nullptr /* path */),
		std::move(loader_assets), property_flags);
		break;
		default:
		const std::string error_msg = base::StringPrintf("Unsupported format type %d", format);
		@@ -282,17 +314,20 @@ static jlong NativeLoadFromFdOffset(JNIEnv* env, jclass /clazz/, const format_
		auto loader_assets = LoaderAssetsProvider::Create(env, assets_provider);
		std::unique_ptr<const ApkAssets> apk_assets;
		switch (format) {
		case FORMAT_APK:
		apk_assets = ApkAssets::LoadFromFd(std::move(dup_fd), friendly_name_utf8.c_str(),
		property_flags, std::move(loader_assets),
		static_cast<off64_t>(offset),
		static_cast<off64_t>(length));
		case FORMAT_APK: {
		auto assets = MultiAssetsProvider::Create(
		std::move(loader_assets),
		ZipAssetsProvider::Create(std::move(dup_fd), friendly_name_utf8.c_str(),
		static_cast<off64_t>(offset), static_cast<off64_t>(length)));
		apk_assets = ApkAssets::Load(std::move(assets), property_flags);
		break;
		}
		case FORMAT_ARSC:
		apk_assets = ApkAssets::LoadTableFromFd(std::move(dup_fd), friendly_name_utf8.c_str(),
		property_flags, std::move(loader_assets),
		apk_assets = ApkAssets::LoadTable(
		AssetsProvider::CreateAssetFromFd(std::move(dup_fd), nullptr /* path */,
		static_cast<off64_t>(offset),
		static_cast<off64_t>(length));
		static_cast<off64_t>(length)),
		std::move(loader_assets), property_flags);
		break;
		default:
		const std::string error_msg = base::StringPrintf("Unsupported format type %d", format);
		@@ -310,8 +345,7 @@ static jlong NativeLoadFromFdOffset(JNIEnv* env, jclass /clazz/, const format_
		}

		static jlong NativeLoadEmpty(JNIEnv* env, jclass /clazz/, jint flags, jobject assets_provider) {
		auto loader_assets = LoaderAssetsProvider::Create(env, assets_provider);
		auto apk_assets = ApkAssets::LoadEmpty(flags, std::move(loader_assets));
		auto apk_assets = ApkAssets::Load(LoaderAssetsProvider::Create(env, assets_provider), flags);
		return reinterpret_cast<jlong>(apk_assets.release());
		}

		@@ -458,6 +492,8 @@ int register_android_content_res_ApkAssets(JNIEnv* env) {
		gAssetsProviderOffsets.loadAssetFd = GetMethodIDOrDie(
		env, gAssetsProviderOffsets.classObject, "loadAssetFd",
		"(Ljava/lang/String;I)Landroid/content/res/AssetFileDescriptor;");
		gAssetsProviderOffsets.toString = GetMethodIDOrDie(
		env, gAssetsProviderOffsets.classObject, "toString", "()Ljava/lang/String;");

		jclass parcelFd = FindClassOrDie(env, "android/os/ParcelFileDescriptor");
		gParcelFileDescriptorOffsets.detachFd = GetMethodIDOrDie(env, parcelFd, "detachFd", "()I");

libs/androidfw/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ cc_library {
		"AssetDir.cpp",
		"AssetManager.cpp",
		"AssetManager2.cpp",
		"AssetsProvider.cpp",
		"AttributeResolution.cpp",
		"ChunkIterator.cpp",
		"ConfigDescription.cpp",

libs/androidfw/ApkAssets.cpp

+88 −476

File changed.

Preview size limit exceeded, changes collapsed.

libs/androidfw/AssetsProvider.cpp

0 → 100644

+398 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "androidfw/AssetsProvider.h"

		#include <sys/stat.h>

		#include <android-base/errors.h>
		#include <android-base/stringprintf.h>
		#include <android-base/utf8.h>
		#include <ziparchive/zip_archive.h>

		namespace android {
		namespace {
		constexpr const char* kEmptyDebugString = "<empty>";
		} // namespace

		std::unique_ptr<Asset> AssetsProvider::Open(const std::string& path, Asset::AccessMode mode,
		bool* file_exists) const {
		return OpenInternal(path, mode, file_exists);
		}

		std::unique_ptr<Asset> AssetsProvider::CreateAssetFromFile(const std::string& path) {
		base::unique_fd fd(base::utf8::open(path.c_str(), O_RDONLY \| O_CLOEXEC));
		if (!fd.ok()) {
		LOG(ERROR) << "Failed to open file '" << path << "': " << base::SystemErrorCodeToString(errno);
		return {};
		}

		return CreateAssetFromFd(std::move(fd), path.c_str());
		}

		std::unique_ptr<Asset> AssetsProvider::CreateAssetFromFd(base::unique_fd fd,
		const char* path,
		off64_t offset,
		off64_t length) {
		CHECK(length >= kUnknownLength) << "length must be greater than or equal to " << kUnknownLength;
		CHECK(length != kUnknownLength \|\| offset == 0) << "offset must be 0 if length is "
		<< kUnknownLength;
		if (length == kUnknownLength) {
		length = lseek64(fd, 0, SEEK_END);
		if (length < 0) {
		LOG(ERROR) << "Failed to get size of file '" << ((path) ? path : "anon") << "': "
		<< base::SystemErrorCodeToString(errno);
		return {};
		}
		}

		incfs::IncFsFileMap file_map;
		if (!file_map.Create(fd, offset, static_cast<size_t>(length), path)) {
		LOG(ERROR) << "Failed to mmap file '" << ((path != nullptr) ? path : "anon") << "': "
		<< base::SystemErrorCodeToString(errno);
		return {};
		}

		// If `path` is set, do not pass ownership of the `fd` to the new Asset since
		// Asset::openFileDescriptor can use `path` to create new file descriptors.
		return Asset::createFromUncompressedMap(std::move(file_map),
		Asset::AccessMode::ACCESS_RANDOM,
		(path != nullptr) ? base::unique_fd(-1) : std::move(fd));
		}

		ZipAssetsProvider::PathOrDebugName::PathOrDebugName(std::string&& value, bool is_path)
		: value_(std::forward<std::string>(value)), is_path_(is_path) {}

		const std::string* ZipAssetsProvider::PathOrDebugName::GetPath() const {
		return is_path_ ? &value_ : nullptr;
		}

		const std::string& ZipAssetsProvider::PathOrDebugName::GetDebugName() const {
		return value_;
		}

		ZipAssetsProvider::ZipAssetsProvider(ZipArchive* handle, PathOrDebugName&& path,
		time_t last_mod_time)
		: zip_handle_(handle, ::CloseArchive),
		name_(std::forward<PathOrDebugName>(path)),
		last_mod_time_(last_mod_time) {}

		std::unique_ptr<ZipAssetsProvider> ZipAssetsProvider::Create(std::string path) {
		ZipArchiveHandle handle;
		if (int32_t result = OpenArchive(path.c_str(), &handle); result != 0) {
		LOG(ERROR) << "Failed to open APK '" << path << "' " << ::ErrorCodeString(result);
		CloseArchive(handle);
		return {};
		}

		struct stat sb{.st_mtime = -1};
		if (stat(path.c_str(), &sb) < 0) {
		// Stat requires execute permissions on all directories path to the file. If the process does
		// not have execute permissions on this file, allow the zip to be opened but IsUpToDate() will
		// always have to return true.
		LOG(WARNING) << "Failed to stat file '" << path << "': "
		<< base::SystemErrorCodeToString(errno);
		}

		return std::unique_ptr<ZipAssetsProvider>(
		new ZipAssetsProvider(handle, PathOrDebugName{std::move(path),
		true /* is_path */}, sb.st_mtime));
		}

		std::unique_ptr<ZipAssetsProvider> ZipAssetsProvider::Create(base::unique_fd fd,
		std::string friendly_name,
		off64_t offset,
		off64_t len) {
		ZipArchiveHandle handle;
		const int released_fd = fd.release();
		const int32_t result = (len == AssetsProvider::kUnknownLength)
		? ::OpenArchiveFd(released_fd, friendly_name.c_str(), &handle)
		: ::OpenArchiveFdRange(released_fd, friendly_name.c_str(), &handle, len, offset);

		if (result != 0) {
		LOG(ERROR) << "Failed to open APK '" << friendly_name << "' through FD with offset " << offset
		<< " and length " << len << ": " << ::ErrorCodeString(result);
		CloseArchive(handle);
		return {};
		}

		struct stat sb{.st_mtime = -1};
		if (fstat(released_fd, &sb) < 0) {
		// Stat requires execute permissions on all directories path to the file. If the process does
		// not have execute permissions on this file, allow the zip to be opened but IsUpToDate() will
		// always have to return true.
		LOG(WARNING) << "Failed to fstat file '" << friendly_name << "': "
		<< base::SystemErrorCodeToString(errno);
		}

		return std::unique_ptr<ZipAssetsProvider>(
		new ZipAssetsProvider(handle, PathOrDebugName{std::move(friendly_name),
		false /* is_path */}, sb.st_mtime));
		}

		std::unique_ptr<Asset> ZipAssetsProvider::OpenInternal(const std::string& path,
		Asset::AccessMode mode,
		bool* file_exists) const {
		if (file_exists != nullptr) {
		*file_exists = false;
		}

		ZipEntry entry;
		if (FindEntry(zip_handle_.get(), path, &entry) != 0) {
		return {};
		}

		if (file_exists != nullptr) {
		*file_exists = true;
		}

		const int fd = GetFileDescriptor(zip_handle_.get());
		const off64_t fd_offset = GetFileDescriptorOffset(zip_handle_.get());
		incfs::IncFsFileMap asset_map;
		if (entry.method == kCompressDeflated) {
		if (!asset_map.Create(fd, entry.offset + fd_offset, entry.compressed_length,
		name_.GetDebugName().c_str())) {
		LOG(ERROR) << "Failed to mmap file '" << path << "' in APK '" << name_.GetDebugName()
		<< "'";
		return {};
		}

		std::unique_ptr<Asset> asset =
		Asset::createFromCompressedMap(std::move(asset_map), entry.uncompressed_length, mode);
		if (asset == nullptr) {
		LOG(ERROR) << "Failed to decompress '" << path << "' in APK '" << name_.GetDebugName()
		<< "'";
		return {};
		}
		return asset;
		}

		if (!asset_map.Create(fd, entry.offset + fd_offset, entry.uncompressed_length,
		name_.GetDebugName().c_str())) {
		LOG(ERROR) << "Failed to mmap file '" << path << "' in APK '" << name_.GetDebugName() << "'";
		return {};
		}

		base::unique_fd ufd;
		if (name_.GetPath() == nullptr) {
		// If the zip name does not represent a path, create a new `fd` for the new Asset to own in
		// order to create new file descriptors using Asset::openFileDescriptor. If the zip name is a
		// path, it will be used to create new file descriptors.
		ufd = base::unique_fd(dup(fd));
		if (!ufd.ok()) {
		LOG(ERROR) << "Unable to dup fd '" << path << "' in APK '" << name_.GetDebugName() << "'";
		return {};
		}
		}

		auto asset = Asset::createFromUncompressedMap(std::move(asset_map), mode, std::move(ufd));
		if (asset == nullptr) {
		LOG(ERROR) << "Failed to mmap file '" << path << "' in APK '" << name_.GetDebugName() << "'";
		return {};
		}
		return asset;
		}

		bool ZipAssetsProvider::ForEachFile(const std::string& root_path,
		const std::function<void(const StringPiece&, FileType)>& f)
		const {
		std::string root_path_full = root_path;
		if (root_path_full.back() != '/') {
		root_path_full += '/';
		}

		void* cookie;
		if (StartIteration(zip_handle_.get(), &cookie, root_path_full, "") != 0) {
		return false;
		}

		std::string name;
		::ZipEntry entry{};

		// We need to hold back directories because many paths will contain them and we want to only
		// surface one.
		std::set<std::string> dirs{};

		int32_t result;
		while ((result = Next(cookie, &entry, &name)) == 0) {
		StringPiece full_file_path(name);
		StringPiece leaf_file_path = full_file_path.substr(root_path_full.size());

		if (!leaf_file_path.empty()) {
		auto iter = std::find(leaf_file_path.begin(), leaf_file_path.end(), '/');
		if (iter != leaf_file_path.end()) {
		std::string dir =
		leaf_file_path.substr(0, std::distance(leaf_file_path.begin(), iter)).to_string();
		dirs.insert(std::move(dir));
		} else {
		f(leaf_file_path, kFileTypeRegular);
		}
		}
		}
		EndIteration(cookie);

		// Now present the unique directories.
		for (const std::string& dir : dirs) {
		f(dir, kFileTypeDirectory);
		}

		// -1 is end of iteration, anything else is an error.
		return result == -1;
		}

		const std::string& ZipAssetsProvider::GetDebugName() const {
		return name_.GetDebugName();
		}

		bool ZipAssetsProvider::IsUpToDate() const {
		struct stat sb{};
		if (fstat(GetFileDescriptor(zip_handle_.get()), &sb) < 0) {
		// If fstat fails on the zip archive, return true so the zip archive the resource system does
		// attempt to refresh the ApkAsset.
		return true;
		}
		return last_mod_time_ == sb.st_mtime;
		}

		DirectoryAssetsProvider::DirectoryAssetsProvider(std::string&& path, time_t last_mod_time)
		: dir_(std::forward<std::string>(path)), last_mod_time_(last_mod_time) {}

		std::unique_ptr<DirectoryAssetsProvider> DirectoryAssetsProvider::Create(std::string path) {
		struct stat sb{};
		const int result = stat(path.c_str(), &sb);
		if (result == -1) {
		LOG(ERROR) << "Failed to find directory '" << path << "'.";
		return nullptr;
		}

		if (!S_ISDIR(sb.st_mode)) {
		LOG(ERROR) << "Path '" << path << "' is not a directory.";
		return nullptr;
		}

		if (path[path.size() - 1] != OS_PATH_SEPARATOR) {
		path += OS_PATH_SEPARATOR;
		}

		return std::unique_ptr<DirectoryAssetsProvider>(new DirectoryAssetsProvider(std::move(path),
		sb.st_mtime));
		}

		std::unique_ptr<Asset> DirectoryAssetsProvider::OpenInternal(const std::string& path,
		Asset::AccessMode /* mode */,
		bool* file_exists) const {
		const std::string resolved_path = dir_ + path;
		if (file_exists != nullptr) {
		struct stat sb{};
		*file_exists = (stat(resolved_path.c_str(), &sb) != -1) && S_ISREG(sb.st_mode);
		}

		return CreateAssetFromFile(resolved_path);
		}

		bool DirectoryAssetsProvider::ForEachFile(
		const std::string& /* root_path */,
		const std::function<void(const StringPiece&, FileType)>& /* f */)
		const {
		return true;
		}

		const std::string& DirectoryAssetsProvider::GetDebugName() const {
		return dir_;
		}

		bool DirectoryAssetsProvider::IsUpToDate() const {
		struct stat sb{};
		if (stat(dir_.c_str(), &sb) < 0) {
		// If stat fails on the zip archive, return true so the zip archive the resource system does
		// attempt to refresh the ApkAsset.
		return true;
		}
		return last_mod_time_ == sb.st_mtime;
		}

		MultiAssetsProvider::MultiAssetsProvider(std::unique_ptr<AssetsProvider>&& primary,
		std::unique_ptr<AssetsProvider>&& secondary)
		: primary_(std::forward<std::unique_ptr<AssetsProvider>>(primary)),
		secondary_(std::forward<std::unique_ptr<AssetsProvider>>(secondary)) {
		if (primary_->GetDebugName() == kEmptyDebugString) {
		debug_name_ = secondary_->GetDebugName();
		} else if (secondary_->GetDebugName() == kEmptyDebugString) {
		debug_name_ = primary_->GetDebugName();
		} else {
		debug_name_ = primary_->GetDebugName() + " and " + secondary_->GetDebugName();
		}
		}

		std::unique_ptr<AssetsProvider> MultiAssetsProvider::Create(
		std::unique_ptr<AssetsProvider>&& primary, std::unique_ptr<AssetsProvider>&& secondary) {
		if (primary == nullptr \|\| secondary == nullptr) {
		return nullptr;
		}
		return std::unique_ptr<MultiAssetsProvider>(new MultiAssetsProvider(std::move(primary),
		std::move(secondary)));
		}

		std::unique_ptr<Asset> MultiAssetsProvider::OpenInternal(const std::string& path,
		Asset::AccessMode mode,
		bool* file_exists) const {
		auto asset = primary_->Open(path, mode, file_exists);
		return (asset) ? std::move(asset) : secondary_->Open(path, mode, file_exists);
		}

		bool MultiAssetsProvider::ForEachFile(const std::string& root_path,
		const std::function<void(const StringPiece&, FileType)>& f)
		const {
		return primary_->ForEachFile(root_path, f) && secondary_->ForEachFile(root_path, f);
		}

		const std::string& MultiAssetsProvider::GetDebugName() const {
		return debug_name_;
		}

		bool MultiAssetsProvider::IsUpToDate() const {
		return primary_->IsUpToDate() && secondary_->IsUpToDate();
		}

		std::unique_ptr<AssetsProvider> EmptyAssetsProvider::Create() {
		return std::make_unique<EmptyAssetsProvider>();
		}

		std::unique_ptr<Asset> EmptyAssetsProvider::OpenInternal(const std::string& /* path */,
		Asset::AccessMode /* mode */,
		bool* file_exists) const {
		if (file_exists) {
		*file_exists = false;
		}
		return nullptr;
		}

		bool EmptyAssetsProvider::ForEachFile(
		const std::string& /* root_path */,
		const std::function<void(const StringPiece&, FileType)>& /* f */) const {
		return true;
		}

		const std::string& EmptyAssetsProvider::GetDebugName() const {
		const static std::string kEmpty = kEmptyDebugString;
		return kEmpty;
		}

		bool EmptyAssetsProvider::IsUpToDate() const {
		return true;
		}

		} // namespace android
		No newline at end of file

libs/androidfw/Idmap.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ LoadedIdmap::LoadedIdmap(std::string&& idmap_path,
		target_apk_path_(target_apk_path),
		idmap_last_mod_time_(getFileModDate(idmap_path_.data())) {}

		std::unique_ptr<const LoadedIdmap> LoadedIdmap::Load(const StringPiece& idmap_path,
		std::unique_ptr<LoadedIdmap> LoadedIdmap::Load(const StringPiece& idmap_path,
		const StringPiece& idmap_data) {
		ATRACE_CALL();
		size_t data_size = idmap_data.size();