summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2016-02-16 15:01:43 -0800
committerThe Android Automerger <android-build@google.com>2016-02-26 14:34:11 -0800
commit81df1cc77722000f8d0025c1ab00ced123aa573c (patch)
tree341f27dd2886b5039bf38d1d7e2164d8e0bfdd41
parent669ecc2f5e80ff924fa20ce7445354a7c5bcfd98 (diff)
downloadcore-android-5.1.1_r37.tar.gz
Partial backport of cf79748. Bug: http://b/26403620 Change-Id: Ib877ab6cfab6aef079830c5a50ba81141ead35ee
-rw-r--r--debuggerd/tombstone.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 0c1b80fdc..46f453b18 100644
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -743,21 +743,8 @@ char* engrave_tombstone(pid_t pid, pid_t tid, int signal, int original_si_code,
log.current_tid = tid;
log.crashed_tid = tid;
- if ((mkdir(TOMBSTONE_DIR, 0755) == -1) && (errno != EEXIST)) {
- _LOG(&log, logtype::ERROR, "failed to create %s: %s\n", TOMBSTONE_DIR, strerror(errno));
- }
-
- if (chown(TOMBSTONE_DIR, AID_SYSTEM, AID_SYSTEM) == -1) {
- _LOG(&log, logtype::ERROR, "failed to change ownership of %s: %s\n", TOMBSTONE_DIR, strerror(errno));
- }
-
int fd = -1;
- char* path = NULL;
- if (selinux_android_restorecon(TOMBSTONE_DIR, 0) == 0) {
- path = find_and_open_tombstone(&fd);
- } else {
- _LOG(&log, logtype::ERROR, "Failed to restore security context, not writing tombstone.\n");
- }
+ char* path = find_and_open_tombstone(&fd);
if (fd < 0) {
_LOG(&log, logtype::ERROR, "Skipping tombstone write, nothing to do.\n");