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

Commit 3dcd8834 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "binderLibTest: setRequestingSid" am: 839daf80 am: c1e856b2 am: d0830f59 am: aa97c403 

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

Change-Id: I2bbe597ca9b9040c614ce06261e39047274477bb
parents b85f9901 aa97c403

libs/binder/tests/binderLibTest.cpp

+12 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ enum BinderLibTestTranscationCode { 
    BINDER_LIB_TEST_GETPID,

    BINDER_LIB_TEST_ECHO_VECTOR,

    BINDER_LIB_TEST_REJECT_BUF,

    BINDER_LIB_TEST_CAN_GET_SID,

};



pid_t start_server_process(int arg2, bool usePoll = false)
@@ -1192,6 +1193,14 @@ TEST_F(BinderLibTest, BufRejected) { 
    EXPECT_NE(NO_ERROR, ret);

}



TEST_F(BinderLibTest, GotSid) {

    sp<IBinder> server = addServer();



    Parcel data;

    status_t ret = server->transact(BINDER_LIB_TEST_CAN_GET_SID, data, nullptr);

    EXPECT_EQ(OK, ret);

}



class BinderLibTestService : public BBinder

{

    public:
@@ -1494,6 +1503,9 @@ class BinderLibTestService : public BBinder 
            case BINDER_LIB_TEST_REJECT_BUF: {

                return data.objectsCount() == 0 ? BAD_VALUE : NO_ERROR;

            }

            case BINDER_LIB_TEST_CAN_GET_SID: {

                return IPCThreadState::self()->getCallingSid() == nullptr ? BAD_VALUE : NO_ERROR;

            }

            default:

                return UNKNOWN_TRANSACTION;

            };