Merge "libbinder: Add log when FDs aren't supported in RpcSession" into main

Treehugger Robot · Gerrit Code Review · commit f5883db738ee · 2024-07-09T01:11:06.000Z
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
@@ -1585,10 +1585,15 @@ status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership) {
             fdVariant = borrowed_fd(fd);
         }
         if (!mAllowFds) {
+            ALOGE("FDs are not allowed in this parcel. Both the service and the client must set "
+                  "the FileDescriptorTransportMode and agree on the support.");
             return FDS_NOT_ALLOWED;
         }
         switch (rpcFields->mSession->getFileDescriptorTransportMode()) {
             case RpcSession::FileDescriptorTransportMode::NONE: {
+                ALOGE("FDs are not allowed in this RpcSession. Both the service and the client "
+                      "must set "
+                      "the FileDescriptorTransportMode and agree on the support.");
                 return FDS_NOT_ALLOWED;
             }
             case RpcSession::FileDescriptorTransportMode::UNIX:

Original file line number	Diff line number	Diff line change
`@@ -1585,10 +1585,15 @@ status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership) {`
`1585`	`1585`	`fdVariant = borrowed_fd(fd);`
`1586`	`1586`	`}`
`1587`	`1587`	`if (!mAllowFds) {`
	`1588`	`+ ALOGE("FDs are not allowed in this parcel. Both the service and the client must set "`
	`1589`	`+ "the FileDescriptorTransportMode and agree on the support.");`
`1588`	`1590`	`return FDS_NOT_ALLOWED;`
`1589`	`1591`	`}`
`1590`	`1592`	`switch (rpcFields->mSession->getFileDescriptorTransportMode()) {`
`1591`	`1593`	`case RpcSession::FileDescriptorTransportMode::NONE: {`
	`1594`	`+ ALOGE("FDs are not allowed in this RpcSession. Both the service and the client "`
	`1595`	`+ "must set "`
	`1596`	`+ "the FileDescriptorTransportMode and agree on the support.");`
`1592`	`1597`	`return FDS_NOT_ALLOWED;`
`1593`	`1598`	`}`
`1594`	`1599`	`case RpcSession::FileDescriptorTransportMode::UNIX:`