summaryrefslogtreecommitdiff
path: root/core/jni/fd_utils.cpp
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2019-06-14 06:46:17 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-14 06:46:17 -0700
commite178e460540af3aa75071ba4777fd9d7df215a40 (patch)
tree8377e36093fc98074b1998c058a95a23c481c7d9 /core/jni/fd_utils.cpp
parentb06bed082a733f4f528e131490e79bfa81dc93dc (diff)
parent5127a760dbb0b7101fbf56428d34304d0075a688 (diff)
Merge "Print the fd that isn't whitelisted." am: cf8db35738
am: 5127a760db Change-Id: I3504cb8d53c852a46a63a54acba778a8db55f59c
Diffstat (limited to 'core/jni/fd_utils.cpp')
-rw-r--r--core/jni/fd_utils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index fa5f931470b0..e5d6393530e4 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -251,7 +251,7 @@ FileDescriptorInfo* FileDescriptorInfo::CreateFromFd(int fd, fail_fn_t fail_fn)
}
if (!whitelist->IsAllowed(file_path)) {
- fail_fn(std::string("Not whitelisted : ").append(file_path));
+ fail_fn(android::base::StringPrintf("Not whitelisted (%d): %s", fd, file_path.c_str()));
}
// File descriptor flags : currently on FD_CLOEXEC. We can set these