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

Commit d581e57e authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Binder RPC test: check execl return status" into main am: 050c801a... 

Merge "Binder RPC test: check execl return status" into main am: 050c801a am: 13a390c9 am: 3161ff6e

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



Change-Id: I6bd68b8f9b8da562897a45884070096ad5a8c82c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0a24d7c 3161ff6e

libs/binder/Utils.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#pragma once



#include <stddef.h>

#include <sys/uio.h>

#include <cstdint>

libs/binder/tests/binderRpcTest.cpp

+4 −2
Original line number Diff line number Diff line
@@ -287,8 +287,10 @@ std::unique_ptr<ProcessSession> BinderRpc::createRpcTestSocketServerProcessEtc( 


                auto writeFd = std::to_string(writeEnd.get());

                auto readFd = std::to_string(readEnd.get());

                execl(servicePath.c_str(), servicePath.c_str(), writeFd.c_str(), readFd.c_str(),

                      NULL);

                auto status = execl(servicePath.c_str(), servicePath.c_str(), writeFd.c_str(),

                                    readFd.c_str(), NULL);

                PLOGF("execl('%s', _, %s, %s) should not return at all, but it returned %d",

                      servicePath.c_str(), writeFd.c_str(), readFd.c_str(), status);

            }));



    BinderRpcTestServerConfig serverConfig;