Don't report errors when trying to delete a non-existing profile dir
Also, put destroy_app_current_profiles behind FLAG_STORAGE_DE flag.
Bug: 27081617
Change-Id: Ib8b9ff292784c659259ceb4339b803e3580da7ed
diff --git a/cmds/installd/utils.h b/cmds/installd/utils.h
index 9bbddca..416a726 100644
--- a/cmds/installd/utils.h
+++ b/cmds/installd/utils.h
@@ -99,12 +99,13 @@
int is_valid_package_name(const char* pkgname);
-int delete_dir_contents(const std::string& pathname);
-int delete_dir_contents_and_dir(const std::string& pathname);
+int delete_dir_contents(const std::string& pathname, bool ignore_if_missing = false);
+int delete_dir_contents_and_dir(const std::string& pathname, bool ignore_if_missing = false);
int delete_dir_contents(const char *pathname,
int also_delete_dir,
- int (*exclusion_predicate)(const char *name, const int is_dir));
+ int (*exclusion_predicate)(const char *name, const int is_dir),
+ bool ignore_if_missing = false);
int delete_dir_contents_fd(int dfd, const char *name);