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

Commit 41ba6926 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Revert "Revert "libbinder: Export older version of enforceInterface symbol"" 

This reverts commit a59da5da, and fixes
the header so it only affects libbinder itself

Change-Id: If20eb4202604adf254c91f1fa3c8c2753a4f0e59
parent f8f7dbd4

include/binder/Parcel.h

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ public: 
    // passed in.

    bool                enforceInterface(const String16& interface,

                                         IPCThreadState* threadState = NULL) const;

#ifdef _INTERNAL_BINDER_PARCEL_

    bool                enforceInterface(const String16& interface) const;

#endif

    bool                checkInterface(IBinder*) const;



    void                freeData();

libs/binder/Parcel.cpp

+8 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define LOG_TAG "Parcel"

//#define LOG_NDEBUG 0



#define _INTERNAL_BINDER_PARCEL_

#include <binder/Parcel.h>



#include <binder/IPCThreadState.h>
@@ -452,9 +453,15 @@ status_t Parcel::writeInterfaceToken(const String16& interface) 
    return writeString16(interface);

}



bool Parcel::enforceInterface(const String16& interface) const

{

	return enforceInterface(interface,NULL);

}





bool Parcel::checkInterface(IBinder* binder) const

{

    return enforceInterface(binder->getInterfaceDescriptor());

    return enforceInterface(binder->getInterfaceDescriptor(),NULL);

}



bool Parcel::enforceInterface(const String16& interface,