commit 5cb2526843d0f4981f8b3356597e62772b664140
author Alex Buynytskyy <alexbuy@google.com> Tue Feb 15 08:59:36 2022 -0800
committer Alex Buynytskyy <alexbuy@google.com> Wed Feb 16 07:40:27 2022 +0000
tree c4e2ce41df5d75d245b458e577ef40d3aa47cf51
parent d7bb61285f8016e7e5321d032b91a31e0f432712

Remove rename/delete for external storage.

Apparently installd does not have permission to do so.

Bug: 219579713
Bug: 219588776
Bug: 219650739
Test: atest ExternalStorageHostTest PackageSettingTest
Change-Id: I66b3bdfe299c2395ecc2f71cd1ffc88881d4d48c

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 953847e..91f7d3b 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -994,15 +994,15 @@
             }
 
             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 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

diff --git a/cmds/installd/utils.h b/cmds/installd/utils.h
index ffde562..04f3bc9 100644
--- a/cmds/installd/utils.h
+++ b/cmds/installd/utils.h
@@ -121,7 +121,7 @@
 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);