Merge "Create a new mount mode for installer packages." (95268aeb) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -306,6 +306,6 @@ public abstract class ActivityManagerInternal {
		public abstract void setDebugFlagsForStartingActivity(ActivityInfo aInfo, int startFlags,
		ProfilerInfo profilerInfo, Object wmLock);

		/** Checks if process running with given pid has access to full external storage or not */
		public abstract boolean isAppStorageSandboxed(int pid, int uid);
		/** Returns mount mode for process running with given pid */
		public abstract int getStorageMountMode(int pid, int uid);
		}

core/java/android/os/ZygoteProcess.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -398,6 +398,8 @@ public class ZygoteProcess {
		argsForZygote.add("--mount-external-write");
		} else if (mountExternal == Zygote.MOUNT_EXTERNAL_FULL) {
		argsForZygote.add("--mount-external-full");
		} else if (mountExternal == Zygote.MOUNT_EXTERNAL_INSTALLER) {
		argsForZygote.add("--mount-external-installer");
		}

		argsForZygote.add("--target-sdk-version=" + targetSdkVersion);

core/java/com/android/internal/os/Zygote.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,11 @@ public final class Zygote {
		public static final int MOUNT_EXTERNAL_READ = IVold.REMOUNT_MODE_READ;
		/** Read-write external storage should be mounted. */
		public static final int MOUNT_EXTERNAL_WRITE = IVold.REMOUNT_MODE_WRITE;
		/**
		* Mount mode for package installers which should give them access to
		* all obb dirs in addition to their package sandboxes
		*/
		public static final int MOUNT_EXTERNAL_INSTALLER = IVold.REMOUNT_MODE_INSTALLER;
		/** Read-write external storage should be mounted instead of package sandbox */
		public static final int MOUNT_EXTERNAL_FULL = IVold.REMOUNT_MODE_FULL;

core/java/com/android/internal/os/ZygoteConnection.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -656,6 +656,8 @@ class ZygoteConnection {
		mountExternal = Zygote.MOUNT_EXTERNAL_WRITE;
		} else if (arg.equals("--mount-external-full")) {
		mountExternal = Zygote.MOUNT_EXTERNAL_FULL;
		} else if (arg.equals("--mount-external-installer")) {
		mountExternal = Zygote.MOUNT_EXTERNAL_INSTALLER;
		} else if (arg.equals("--query-abi-list")) {
		abiListQuery = true;
		} else if (arg.equals("--get-pid")) {

core/jni/com_android_internal_os_Zygote.cpp

+46 −16

Original line number	Diff line number	Diff line
		@@ -99,7 +99,8 @@ enum MountExternalKind {
		MOUNT_EXTERNAL_DEFAULT = 1,
		MOUNT_EXTERNAL_READ = 2,
		MOUNT_EXTERNAL_WRITE = 3,
		MOUNT_EXTERNAL_FULL = 4,
		MOUNT_EXTERNAL_INSTALLER = 4,
		MOUNT_EXTERNAL_FULL = 5,
		};

		// Must match values in com.android.internal.os.Zygote.
		@@ -446,29 +447,35 @@ static bool createPkgSandbox(uid_t uid, const std::string& package_name, std::st
		return true;
		}

		static bool mountPkgSpecificDir(const std::string& mntSourceRoot,
		const std::string& mntTargetRoot, const std::string& packageName,
		const char* dirName, std::string* error_msg) {
		std::string mntSourceDir = StringPrintf("%s/Android/%s/%s",
		mntSourceRoot.c_str(), dirName, packageName.c_str());
		std::string mntTargetDir = StringPrintf("%s/Android/%s/%s",
		mntTargetRoot.c_str(), dirName, packageName.c_str());
		if (TEMP_FAILURE_RETRY(mount(mntSourceDir.c_str(), mntTargetDir.c_str(),
		static bool bindMount(const std::string& sourceDir, const std::string& targetDir,
		std::string* error_msg) {
		if (TEMP_FAILURE_RETRY(mount(sourceDir.c_str(), targetDir.c_str(),
		nullptr, MS_BIND \| MS_REC, nullptr)) == -1) {
		*error_msg = CREATE_ERROR("Failed to mount %s to %s: %s",
		mntSourceDir.c_str(), mntTargetDir.c_str(), strerror(errno));
		sourceDir.c_str(), targetDir.c_str(), strerror(errno));
		return false;
		}
		if (TEMP_FAILURE_RETRY(mount(nullptr, mntTargetDir.c_str(),
		if (TEMP_FAILURE_RETRY(mount(nullptr, targetDir.c_str(),
		nullptr, MS_SLAVE \| MS_REC, nullptr)) == -1) {
		*error_msg = CREATE_ERROR("Failed to set MS_SLAVE for %s", mntTargetDir.c_str());
		*error_msg = CREATE_ERROR("Failed to set MS_SLAVE for %s", targetDir.c_str());
		return false;
		}
		return true;
		}

		static bool mountPkgSpecificDir(const std::string& mntSourceRoot,
		const std::string& mntTargetRoot, const std::string& packageName,
		const char* dirName, std::string* error_msg) {
		std::string mntSourceDir = StringPrintf("%s/Android/%s/%s",
		mntSourceRoot.c_str(), dirName, packageName.c_str());
		std::string mntTargetDir = StringPrintf("%s/Android/%s/%s",
		mntTargetRoot.c_str(), dirName, packageName.c_str());
		return bindMount(mntSourceDir, mntTargetDir, error_msg);
		}

		static bool preparePkgSpecificDirs(const std::vector<std::string>& packageNames,
		const std::vector<std::string>& volumeLabels, userid_t userId, std::string* error_msg) {
		const std::vector<std::string>& volumeLabels, bool mountAllObbs,
		userid_t userId, std::string* error_msg) {
		for (auto& label : volumeLabels) {
		std::string mntSource = StringPrintf("/mnt/runtime/write/%s", label.c_str());
		std::string mntTarget = StringPrintf("/storage/%s", label.c_str());
		@@ -479,9 +486,16 @@ static bool preparePkgSpecificDirs(const std::vector<std::string>& packageNames,
		for (auto& package : packageNames) {
		mountPkgSpecificDir(mntSource, mntTarget, package, "data", error_msg);
		mountPkgSpecificDir(mntSource, mntTarget, package, "media", error_msg);
		if (!mountAllObbs) {
		mountPkgSpecificDir(mntSource, mntTarget, package, "obb", error_msg);
		}
		}
		if (mountAllObbs) {
		StringAppendF(&mntSource, "/Android/obb");
		StringAppendF(&mntTarget, "/Android/obb");
		bindMount(mntSource, mntTarget, error_msg);
		}
		}
		return true;
		}

		@@ -500,7 +514,7 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode,
		storageSource = "/mnt/runtime/read";
		} else if (mount_mode == MOUNT_EXTERNAL_WRITE) {
		storageSource = "/mnt/runtime/write";
		} else if (mount_mode != MOUNT_EXTERNAL_FULL && !force_mount_namespace) {
		} else if (mount_mode == MOUNT_EXTERNAL_NONE && !force_mount_namespace) {
		// Sane default of no storage visible
		return true;
		}
		@@ -568,12 +582,28 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode,
		pkgSandboxDir.c_str(), strerror(errno));
		return false;
		}
		if (access("/storage/obb_mount", F_OK) == 0) {
		if (mount_mode != MOUNT_EXTERNAL_INSTALLER) {
		remove("/storage/obb_mount");
		}
		} else {
		if (mount_mode == MOUNT_EXTERNAL_INSTALLER) {
		int fd = TEMP_FAILURE_RETRY(open("/storage/obb_mount",
		O_RDWR \| O_CREAT, 0660));
		if (fd == -1) {
		*error_msg = CREATE_ERROR("Couldn't create /storage/obb_mount: %s",
		strerror(errno));
		return false;
		}
		close(fd);
		}
		}
		// If the sandbox was already created by vold, only then set up the bind mounts for
		// pkg specific directories. Otherwise, leave as is and bind mounts will be taken
		// care of by vold later.
		if (sandboxAlreadyCreated) {
		if (!preparePkgSpecificDirs(packages_for_uid, visible_vol_ids,
		user_id, error_msg)) {
		mount_mode == MOUNT_EXTERNAL_INSTALLER, user_id, error_msg)) {
		return false;
		}
		}