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

Commit b74cf374 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents e7a74461 03e778b9

include/binder/MemoryHeapBase.h

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ public: 
        MAP_ONCE = IMemoryHeap::MAP_ONCE,

        // memory won't be mapped locally, but will be mapped in the remote

        // process.

        DONT_MAP_LOCALLY = 0x00000100

        DONT_MAP_LOCALLY = 0x00000100,

        NO_CACHING = 0x00000200

    };



    /*

libs/binder/MemoryHeapBase.cpp

+5 −1
Original line number Diff line number Diff line
@@ -67,7 +67,11 @@ MemoryHeapBase::MemoryHeapBase(const char* device, size_t size, uint32_t flags) 
    : mFD(-1), mSize(0), mBase(MAP_FAILED), mFlags(flags),

      mDevice(0), mNeedUnmap(false)

{

    int fd = open(device, O_RDWR);

    int open_flags = O_RDWR;

    if (flags & NO_CACHING)

        open_flags |= O_SYNC;



    int fd = open(device, open_flags);

    LOGE_IF(fd<0, "error opening %s: %s", device, strerror(errno));

    if (fd >= 0) {

        const size_t pagesize = getpagesize();

libs/rs/rsSimpleMesh.cpp

+0 −2
Original line number Diff line number Diff line
@@ -99,8 +99,6 @@ SimpleMeshContext::SimpleMeshContext() 


SimpleMeshContext::~SimpleMeshContext()

{

    delete[] mVertexTypes;

    delete[] mVertexBuffers;

}

libs/rs/rsType.cpp

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ TypeState::TypeState() 


TypeState::~TypeState()

{

    delete[] mLODs;

}



size_t Type::getOffsetForFace(uint32_t face) const