commit 02705d68a8ceae0ee21ab6629eb154ce6f7aa95f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jul 09 02:14:21 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 09 02:14:21 2024 +0000
tree de3d0acb0574ec9ae509a8d244528d41fc5ba415
parent 20f122f9ad974cf0bf6e322bae47cfa93a7d95b0
parent 923c710a6d62684a017a62a091363b645beaaf82

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3156117

Change-Id: I6d42f7acabd898cf6f3dd5fc655d2f0649b0704a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 3f70e8c..e8fe555 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1585,10 +1585,15 @@
             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: