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

Commit 153008ef authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 9df25446: am 9bad590e: Merge "Binder on Windows? Unlikely." 

* commit '9df25446':
  Binder on Windows? Unlikely.
parents f0a34a2d 9df25446

libs/binder/ProcessState.cpp

+0 −7
Original line number Original line Diff line number Diff line
@@ -350,10 +350,6 @@ ProcessState::ProcessState() 
    , mThreadPoolSeq(1)

    , mThreadPoolSeq(1)

{

{

    if (mDriverFD >= 0) {

    if (mDriverFD >= 0) {

        // XXX Ideally, there should be a specific define for whether we

        // have mmap (or whether we could possibly have the kernel module

        // availabla).

#if !defined(HAVE_WIN32_IPC)

        // 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(0, BINDER_VM_SIZE, PROT_READ, MAP_PRIVATE | MAP_NORESERVE, mDriverFD, 0);

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

        if (mVMStart == MAP_FAILED) {

        if (mVMStart == MAP_FAILED) {
@@ -362,9 +358,6 @@ ProcessState::ProcessState() 
            close(mDriverFD);

            close(mDriverFD);

            mDriverFD = -1;

            mDriverFD = -1;

        }

        }

#else

        mDriverFD = -1;

#endif

    }

    }





    LOG_ALWAYS_FATAL_IF(mDriverFD < 0, "Binder driver could not be opened.  Terminating.");

    LOG_ALWAYS_FATAL_IF(mDriverFD < 0, "Binder driver could not be opened.  Terminating.");