commit b06f98aabc5381fd6366526d9b31b5d0345481b6
author Calin Juravle <calin@google.com> Mon Mar 28 15:11:01 2016 +0100
committer Calin Juravle <calin@google.com> Mon Mar 28 16:43:10 2016 +0100
tree 9c4b8a228cf5be198fe58e3ed4e02d2bb54d8ba6
parent d6ab01105bbd80dfa2fc2debc8e31d6422c378ee

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

cmds/installd/commands.cpp

diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp
index 8350da7..ff5a3b8 100644
--- a/cmds/installd/commands.cpp
+++ b/cmds/installd/commands.cpp
@@ -235,7 +235,9 @@
 }
 
 static int destroy_app_current_profiles(const char *pkgname, userid_t userid) {
-    return delete_dir_contents_and_dir(create_data_user_profile_package_path(userid, pkgname));
+    return delete_dir_contents_and_dir(
+        create_data_user_profile_package_path(userid, pkgname),
+        /*ignore_if_missing*/ true);
 }
 
 int destroy_app_profiles(const char *pkgname) {
@@ -244,7 +246,9 @@
     for (auto user : users) {
         result |= destroy_app_current_profiles(pkgname, user);
     }
-    result |= delete_dir_contents_and_dir(create_data_ref_profile_package_path(pkgname));
+    result |= delete_dir_contents_and_dir(
+        create_data_ref_profile_package_path(pkgname),
+        /*ignore_if_missing*/ true);
     return result;
 }
 
@@ -257,8 +261,8 @@
     if (flags & FLAG_STORAGE_DE) {
         res |= delete_dir_contents_and_dir(
                 create_data_user_de_package_path(uuid, userid, pkgname));
+        destroy_app_current_profiles(pkgname, userid);
     }
-    destroy_app_current_profiles(pkgname, userid);
     return res;
 }