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

Commit 055fc41e authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: vendor binder has a different header" into stage-aosp-master am: 3ccd1b65 

am: 4a43a522

Change-Id: I698899d484d359cb47569c74b9ba2c6ea6e19a7f
parents be96072e 4a43a522

libs/binder/Parcel.cpp

+13 −0
Original line number Diff line number Diff line
@@ -590,6 +590,12 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const { 
    }

}



#ifdef __ANDROID_VNDK__

constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R');

#else

constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T');

#endif



// Write RPC headers.  (previously just the interface token)

status_t Parcel::writeInterfaceToken(const String16& interface)

{
@@ -598,6 +604,7 @@ status_t Parcel::writeInterfaceToken(const String16& interface) 
    updateWorkSourceRequestHeaderPosition();

    writeInt32(threadState->shouldPropagateWorkSource() ?

            threadState->getCallingWorkSourceUid() : IPCThreadState::kUnsetWorkSource);

    writeInt32(kHeader);

    // currently the interface identification token is just its name as a string

    return writeString16(interface);

}
@@ -655,6 +662,12 @@ bool Parcel::enforceInterface(const String16& interface, 
    updateWorkSourceRequestHeaderPosition();

    int32_t workSource = readInt32();

    threadState->setCallingWorkSourceUidWithoutPropagation(workSource);

    // vendor header

    int32_t header = readInt32();

    if (header != kHeader) {

        ALOGE("Expecting header 0x%x but found 0x%x. Mixing copies of libbinder?", kHeader, header);

        return false;

    }

    // Interface descriptor.

    const String16 str(readString16());

    if (str == interface) {