Revert "Newly create idmap only when it is outdated"
This reverts commit 1d091465334784adeded4ef182cc6f732eb6f99e.
Reason for revert: Causes b/37992057
Change-Id: I7811483016b28a88d6a50bd445dd5d5e8d2e48d6
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index bdf69b9..989fcda 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -1961,8 +1961,6 @@
int idmap_fd = -1;
char idmap_path[PATH_MAX];
- struct stat target_apk_stat, overlay_apk_stat, idmap_stat;
- bool outdated = false;
if (flatten_path(IDMAP_PREFIX, IDMAP_SUFFIX, overlay_apk,
idmap_path, sizeof(idmap_path)) == -1) {
@@ -1970,22 +1968,8 @@
goto fail;
}
- if (stat(idmap_path, &idmap_stat) < 0 ||
- stat(target_apk, &target_apk_stat) < 0 ||
- stat(overlay_apk, &overlay_apk_stat) < 0) {
- outdated = true;
- } else if (idmap_stat.st_mtime < target_apk_stat.st_mtime ||
- idmap_stat.st_mtime < overlay_apk_stat.st_mtime) {
- outdated = true;
- }
-
- if (outdated) {
- unlink(idmap_path);
- idmap_fd = open(idmap_path, O_RDWR | O_CREAT | O_EXCL, 0644);
- } else {
- idmap_fd = open(idmap_path, O_RDWR);
- }
-
+ unlink(idmap_path);
+ idmap_fd = open(idmap_path, O_RDWR | O_CREAT | O_EXCL, 0644);
if (idmap_fd < 0) {
ALOGE("idmap cannot open '%s' for output: %s\n", idmap_path, strerror(errno));
goto fail;
@@ -1999,11 +1983,6 @@
goto fail;
}
- if (!outdated) {
- close(idmap_fd);
- return ok();
- }
-
pid_t pid;
pid = fork();
if (pid == 0) {