Still not safe to mutate DE on secondary users.
Bug: 25796509, 26535916
Change-Id: I694b4a1b5fe3e31578f431bcddf7d6c4070f7852
diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp
index 6b00429..7799ab9 100644
--- a/cmds/installd/commands.cpp
+++ b/cmds/installd/commands.cpp
@@ -69,11 +69,13 @@
auto path = create_data_user_de_package_path(uuid, userid, pkgname);
if (fs_prepare_dir_strict(path.c_str(), 0751, uid, uid) == -1) {
PLOG(ERROR) << "Failed to prepare " << path;
- return -1;
+ // TODO: include result once 25796509 is fixed
+ return 0;
}
if (selinux_android_setfilecon(path.c_str(), pkgname, seinfo, uid) < 0) {
PLOG(ERROR) << "Failed to setfilecon " << path;
- return -1;
+ // TODO: include result once 25796509 is fixed
+ return 0;
}
}
return 0;
@@ -97,7 +99,8 @@
if (flags & FLAG_DE_STORAGE) {
auto path = create_data_user_de_package_path(uuid, userid, pkgname) + suffix;
if (access(path.c_str(), F_OK) == 0) {
- res |= delete_dir_contents(path);
+ // TODO: include result once 25796509 is fixed
+ delete_dir_contents(path);
}
}
return res;
@@ -110,7 +113,8 @@
create_data_user_package_path(uuid, userid, pkgname));
}
if (flags & FLAG_DE_STORAGE) {
- res |= delete_dir_contents_and_dir(
+ // TODO: include result once 25796509 is fixed
+ delete_dir_contents_and_dir(
create_data_user_de_package_path(uuid, userid, pkgname));
}
return res;
@@ -243,7 +247,8 @@
std::string media_path(create_data_media_path(uuid, userid));
res |= delete_dir_contents_and_dir(data_path);
- res |= delete_dir_contents_and_dir(data_de_path);
+ // TODO: include result once 25796509 is fixed
+ delete_dir_contents_and_dir(data_de_path);
res |= delete_dir_contents_and_dir(media_path);
// Config paths only exist on internal storage