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

Commit cec0a2be authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13840385 from d1d529fe to 25Q4-release 

Change-Id: Ide0c0186b26da88c00696b847a731bc16813c557
parents 91719c3e d1d529fe

libs/binder/OS.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ status_t setNonBlocking(borrowed_fd fd); 


status_t getRandomBytes(uint8_t* data, size_t size);



status_t dupFileDescriptor(int oldFd, int* newFd);

LIBBINDER_INTERNAL_EXPORTED status_t dupFileDescriptor(int oldFd, int* newFd);



std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory();

libs/binder/tests/binderRpcTest.cpp

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <trusty/tipc.h>

#endif // BINDER_RPC_TO_TRUSTY_TEST



#include "../OS.h"

#include "../RpcWireFormat.h"

#include "../Utils.h"

#include "binderRpcTestCommon.h"
@@ -1112,7 +1113,8 @@ TEST_P(BinderRpc, AppendInvalidFd) { 
                    {RpcSession::FileDescriptorTransportMode::UNIX},

    });



    int badFd = fcntl(STDERR_FILENO, F_DUPFD_CLOEXEC, 0);

    int badFd;

    ASSERT_EQ(OK, binder::os::dupFileDescriptor(STDERR_FILENO, &badFd));

    ASSERT_NE(badFd, -1);



    // Close the file descriptor so it becomes invalid for dup