Merge "Remove rename/delete for external storage." (a4419eb5) · Commits · e / os / android_frameworks_native

cmds/installd/InstalldNativeService.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -994,15 +994,15 @@ binder::Status InstalldNativeService::destroyAppData(const std::optional<std::st
		}

		auto path = StringPrintf("%s/Android/data/%s", extPath.c_str(), pkgname);
		if (rename_delete_dir_contents_and_dir(path, true) != 0) {
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete contents of " + path);
		}
		path = StringPrintf("%s/Android/media/%s", extPath.c_str(), pkgname);
		if (rename_delete_dir_contents_and_dir(path, true) != 0) {
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete contents of " + path);
		}
		path = StringPrintf("%s/Android/obb/%s", extPath.c_str(), pkgname);
		if (rename_delete_dir_contents_and_dir(path, true) != 0) {
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete contents of " + path);
		}
		}
		@@ -1550,27 +1550,27 @@ binder::Status InstalldNativeService::destroyUserData(const std::optional<std::s
		binder::Status res = ok();
		if (flags & FLAG_STORAGE_DE) {
		auto path = create_data_user_de_path(uuid_, userId);
		if (rename_delete_dir_contents_and_dir(path, true) != 0) {
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete " + path);
		}
		if (uuid_ == nullptr) {
		path = create_data_misc_legacy_path(userId);
		if (rename_delete_dir_contents_and_dir(path, true) != 0) {
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete " + path);
		}
		path = create_primary_cur_profile_dir_path(userId);
		if (rename_delete_dir_contents_and_dir(path, true) != 0) {
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete " + path);
		}
		}
		}
		if (flags & FLAG_STORAGE_CE) {
		auto path = create_data_user_ce_path(uuid_, userId);
		if (rename_delete_dir_contents_and_dir(path, true) != 0) {
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete " + path);
		}
		path = findDataMediaPath(uuid, userId);
		if (rename_delete_dir_contents_and_dir(path, true) != 0) {
		if (delete_dir_contents_and_dir(path, true) != 0) {
		res = error("Failed to delete " + path);
		}
		}

cmds/installd/utils.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ int delete_dir_contents(const std::string& pathname, bool ignore_if_missing = fa
		int delete_dir_contents_and_dir(const std::string& pathname, bool ignore_if_missing = false);

		bool is_renamed_deleted_dir(std::string_view path);
		int rename_delete_dir_contents_and_dir(const std::string& pathname, bool ignore_if_missing = false);
		int rename_delete_dir_contents_and_dir(const std::string& pathname, bool ignore_if_missing = true);

		void cleanup_invalid_package_dirs_under_path(const std::string& pathname);