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

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

Merge "libbinder: log fatal when used in APEX" am: b5667012 

am: 0376fad0

Change-Id: I59e98b12fe21cd740bb7dd875fc905bf4bdcfdca
parents 5b3d1a86 0376fad0

libs/binder/ProcessState.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -385,6 +385,12 @@ ProcessState::ProcessState(const char *driver) 
    , mThreadPoolSeq(1)

    , mThreadPoolSeq(1)

    , mCallRestriction(CallRestriction::NONE)

    , mCallRestriction(CallRestriction::NONE)

{

{



// TODO(b/139016109): enforce in build system

#if defined(__ANDROID_APEX__) && !defined(__ANDROID_APEX_COM_ANDROID_VNDK_CURRENT__)

    LOG_ALWAYS_FATAL("Cannot use libbinder in APEX (only system.img libbinder) since it is not stable.");

#endif



    if (mDriverFD >= 0) {

    if (mDriverFD >= 0) {

        // mmap the binder, providing a chunk of virtual address space to receive transactions.

        // mmap the binder, providing a chunk of virtual address space to receive transactions.

        mVMStart = mmap(nullptr, BINDER_VM_SIZE, PROT_READ, MAP_PRIVATE | MAP_NORESERVE, mDriverFD, 0);

        mVMStart = mmap(nullptr, BINDER_VM_SIZE, PROT_READ, MAP_PRIVATE | MAP_NORESERVE, mDriverFD, 0);