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

Commit d6171d00 authored by Alan Chiou's avatar Alan Chiou Committed by android-build-merger
Browse files

Revert "libbinder: vendor binder has a different header" am: d17bbae2 am:... 

Revert "libbinder: vendor binder has a different header" am: d17bbae2 am: 79a2492f am: e7c92bc3
am: 37f934ab

Change-Id: If0bfcdfa92cb4fa703b30c2cd69d92a4716c47fa
parents 8996015a 37f934ab

libs/binder/Parcel.cpp

+0 −13
Original line number Diff line number Diff line
@@ -494,12 +494,6 @@ 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)

{
@@ -508,7 +502,6 @@ 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);

}
@@ -566,12 +559,6 @@ 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) {