Merge changes I227d8e0c,Ided4415a into rvc-dev am: f3d4495df9 (1cfb5b22) · Commits · e / os / android_frameworks_base

core/java/android/os/incremental/IncrementalManager.java

+40 −52

Original line number	Diff line number	Diff line
		@@ -32,8 +32,12 @@ import java.io.File;
		import java.io.IOException;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.nio.file.FileVisitResult;
		import java.nio.file.Files;
		import java.nio.file.Path;
		import java.nio.file.Paths;
		import java.nio.file.SimpleFileVisitor;
		import java.nio.file.attribute.BasicFileAttributes;

		/**
		* Provides operations to open or create an IncrementalStorage, using IIncrementalService
		@@ -175,25 +179,6 @@ public final class IncrementalManager {
		}
		}

		/**
		* Iterates through path parents to find the base dir of an Incremental Storage.
		*
		* @param file Target file to search storage for.
		* @return Absolute path which is a bind-mount point of Incremental File System.
		*/
		@Nullable
		private Path getStoragePathForFile(File file) {
		File currentPath = new File(file.getParent());
		while (currentPath.getParent() != null) {
		IncrementalStorage storage = openStorage(currentPath.getAbsolutePath());
		if (storage != null) {
		return currentPath.toPath();
		}
		currentPath = new File(currentPath.getParent());
		}
		return null;
		}

		/**
		* Set up an app's code path. The expected outcome of this method is:
		* 1) The actual apk directory under /data/incremental is bind-mounted to the parent directory
		@@ -212,29 +197,27 @@ public final class IncrementalManager {
		*/
		public void renameCodePath(File beforeCodeFile, File afterCodeFile)
		throws IllegalArgumentException, IOException {
		final String beforeCodePath = beforeCodeFile.getAbsolutePath();
		final String afterCodePathParent = afterCodeFile.getParentFile().getAbsolutePath();
		if (!isIncrementalPath(beforeCodePath)) {
		throw new IllegalArgumentException("Not an Incremental path: " + beforeCodePath);
		}
		final String afterCodePathName = afterCodeFile.getName();
		final Path apkStoragePath = Paths.get(beforeCodePath);
		if (apkStoragePath == null \|\| apkStoragePath.toAbsolutePath() == null) {
		throw new IOException("Invalid source storage path for: " + beforeCodePath);
		}
		final IncrementalStorage apkStorage =
		openStorage(apkStoragePath.toAbsolutePath().toString());
		final File beforeCodeAbsolute = beforeCodeFile.getAbsoluteFile();
		final IncrementalStorage apkStorage = openStorage(beforeCodeAbsolute.toString());
		if (apkStorage == null) {
		throw new IOException("Failed to retrieve storage from Incremental Service.");
		throw new IllegalArgumentException("Not an Incremental path: " + beforeCodeAbsolute);
		}
		final IncrementalStorage linkedApkStorage = createStorage(afterCodePathParent, apkStorage,
		final String targetStorageDir = afterCodeFile.getAbsoluteFile().getParent();
		final IncrementalStorage linkedApkStorage =
		createStorage(targetStorageDir, apkStorage,
		IncrementalManager.CREATE_MODE_CREATE
		\| IncrementalManager.CREATE_MODE_PERMANENT_BIND);
		if (linkedApkStorage == null) {
		throw new IOException("Failed to create linked storage at dir: " + afterCodePathParent);
		throw new IOException("Failed to create linked storage at dir: " + targetStorageDir);
		}
		try {
		final String afterCodePathName = afterCodeFile.getName();
		linkFiles(apkStorage, beforeCodeAbsolute, "", linkedApkStorage, afterCodePathName);
		apkStorage.unBind(beforeCodeAbsolute.toString());
		} catch (Exception e) {
		linkedApkStorage.unBind(targetStorageDir);
		throw e;
		}
		linkFiles(apkStorage, beforeCodeFile, "", linkedApkStorage, afterCodePathName);
		apkStorage.unBind(beforeCodePath);
		}

		/**
		@@ -252,22 +235,27 @@ public final class IncrementalManager {
		private void linkFiles(IncrementalStorage sourceStorage, File sourceAbsolutePath,
		String sourceRelativePath, IncrementalStorage targetStorage,
		String targetRelativePath) throws IOException {
		targetStorage.makeDirectory(targetRelativePath);
		final File[] entryList = sourceAbsolutePath.listFiles();
		for (int i = 0; i < entryList.length; i++) {
		final File entry = entryList[i];
		final String entryName = entryList[i].getName();
		final String sourceEntryRelativePath =
		sourceRelativePath.isEmpty() ? entryName : sourceRelativePath + "/" + entryName;
		final String targetEntryRelativePath = targetRelativePath + "/" + entryName;
		if (entry.isFile()) {
		sourceStorage.makeLink(
		sourceEntryRelativePath, targetStorage, targetEntryRelativePath);
		} else if (entry.isDirectory()) {
		linkFiles(sourceStorage, entry, sourceEntryRelativePath, targetStorage,
		targetEntryRelativePath);
		final Path sourceBase = sourceAbsolutePath.toPath().resolve(sourceRelativePath);
		final Path targetRelative = Paths.get(targetRelativePath);
		Files.walkFileTree(sourceAbsolutePath.toPath(), new SimpleFileVisitor<Path>() {
		@Override
		public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
		throws IOException {
		final Path relativeDir = sourceBase.relativize(dir);
		targetStorage.makeDirectory(targetRelative.resolve(relativeDir).toString());
		return FileVisitResult.CONTINUE;
		}

		@Override
		public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
		throws IOException {
		final Path relativeFile = sourceBase.relativize(file);
		sourceStorage.makeLink(
		file.toAbsolutePath().toString(), targetStorage,
		targetRelative.resolve(relativeFile).toString());
		return FileVisitResult.CONTINUE;
		}
		});
		}

		/**

services/incremental/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ filegroup {
		srcs: [
		"incremental_service.c",
		"IncrementalService.cpp",
		"IncrementalServiceValidation.cpp",
		"BinderIncrementalService.cpp",
		"path.cpp",
		"ServiceWrappers.cpp",

services/incremental/BinderIncrementalService.cpp

+6 −7

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@

		#include <android-base/logging.h>
		#include <android-base/no_destructor.h>
		#include <android/os/IVold.h>
		#include <binder/IResultReceiver.h>
		#include <binder/PermissionCache.h>
		#include <incfs.h>
		@@ -117,11 +118,12 @@ binder::Status BinderIncrementalService::openStorage(const std::string& path,
		}

		binder::Status BinderIncrementalService::createStorage(
		const std::string& path, const DataLoaderParamsParcel& params,
		const std::string& path, const content::pm::DataLoaderParamsParcel& params,
		const ::android::sp<::android::content::pm::IDataLoaderStatusListener>& listener,
		int32_t createMode, int32_t* _aidl_return) {
		*_aidl_return =
		mImpl.createStorage(path, const_cast<DataLoaderParamsParcel&&>(params), listener,
		mImpl.createStorage(path, const_cast<content::pm::DataLoaderParamsParcel&&>(params),
		listener,
		android::incremental::IncrementalService::CreateOptions(
		createMode));
		return ok();
		@@ -238,11 +240,8 @@ binder::Status BinderIncrementalService::isFileRangeLoaded(int32_t storageId,
		binder::Status BinderIncrementalService::getMetadataByPath(int32_t storageId,
		const std::string& path,
		std::vector<uint8_t>* _aidl_return) {
		auto fid = mImpl.nodeFor(storageId, path);
		if (fid != kIncFsInvalidFileId) {
		auto metadata = mImpl.getMetadata(storageId, fid);
		auto metadata = mImpl.getMetadata(storageId, path);
		_aidl_return->assign(metadata.begin(), metadata.end());
		}
		return ok();
		}