summaryrefslogtreecommitdiff
path: root/core/jni/fd_utils.cpp
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2019-06-14 06:38:10 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-14 06:38:10 -0700
commit5127a760dbb0b7101fbf56428d34304d0075a688 (patch)
treec14b703b20e61869576587f51dd45ff2a14da992 /core/jni/fd_utils.cpp
parente21b8c9b57c5c1cddba69ca52d641b93e5d17e2a (diff)
parentcf8db357388e606c14fb7142a5324b95fff7a485 (diff)
Merge "Print the fd that isn't whitelisted."
am: cf8db35738 Change-Id: If533954450e094e8b14267dbd6a6f863ae7d4e3c
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 2071b989aef7..6d10fc2b37db 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -238,7 +238,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