Merge "Print the fd that isn't whitelisted."

am: cf8db35738

Change-Id: If533954450e094e8b14267dbd6a6f863ae7d4e3c

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