Merge "Print the fd that isn't whitelisted." am: cf8db35738

am: 5127a760db

Change-Id: I3504cb8d53c852a46a63a54acba778a8db55f59c

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