Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02705d68 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I6d42f7acabd898cf6f3dd5fc655d2f0649b0704a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20f122f9 923c710a

libs/binder/Parcel.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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: