Merge "Ensure that /data/anr/traces.txt is world-writable"

This commit is contained in:
Nick Kralevich 2012-04-06 10:51:11 -07:00 committed by Android (Google) Code Review
commit a344c2bb4d

View File

@ -375,6 +375,7 @@ const char *dump_vm_traces() {
*slash = '\0'; *slash = '\0';
if (!mkdir(anr_traces_dir, 0775)) { if (!mkdir(anr_traces_dir, 0775)) {
chown(anr_traces_dir, AID_SYSTEM, AID_SYSTEM); chown(anr_traces_dir, AID_SYSTEM, AID_SYSTEM);
chmod(anr_traces_dir, 0775);
} else if (errno != EEXIST) { } else if (errno != EEXIST) {
fprintf(stderr, "mkdir(%s): %s\n", anr_traces_dir, strerror(errno)); fprintf(stderr, "mkdir(%s): %s\n", anr_traces_dir, strerror(errno));
return NULL; return NULL;
@ -387,6 +388,12 @@ const char *dump_vm_traces() {
fprintf(stderr, "%s: %s\n", traces_path, strerror(errno)); fprintf(stderr, "%s: %s\n", traces_path, strerror(errno));
return NULL; return NULL;
} }
int chmod_ret = fchmod(fd, 0666);
if (chmod_ret < 0) {
fprintf(stderr, "fchmod on %s failed: %s\n", traces_path, strerror(errno));
close(fd);
return NULL;
}
close(fd); close(fd);
/* walk /proc and kill -QUIT all Dalvik processes */ /* walk /proc and kill -QUIT all Dalvik processes */