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

Commit 3e32e68e authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'remotes/goog/eclair' into eclair-release

parents 9abe5676 8a77baaa

libs/surfaceflinger/BufferAllocator.cpp

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ status_t BufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat format, 
        rec.vaddr = 0;

        rec.size = h * stride[0] * bytesPerPixel(format);

        list.add(*handle, rec);

    } else {

        String8 s;

        dump(s);

        LOGD("%s", s.string());

    }



    return err;

libs/surfaceflinger/SurfaceFlinger.cpp

+1 −9
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ bool SurfaceFlinger::threadLoop() 
    handlePageFlip();



    const DisplayHardware& hw(graphicPlane(0).displayHardware());

    if (LIKELY(hw.canDraw())) {

    if (LIKELY(hw.canDraw() && !isFrozen())) {

        // repaint the framebuffer (if needed)

        handleRepaint();
@@ -512,14 +512,6 @@ bool SurfaceFlinger::threadLoop() 


void SurfaceFlinger::postFramebuffer()

{

    if (isFrozen()) {

        // we are not allowed to draw, but pause a bit to make sure

        // apps don't end up using the whole CPU, if they depend on

        // surfaceflinger for synchronization.

        usleep(8333); // 8.3ms ~ 120fps

        return;

    }



    if (!mInvalidRegion.isEmpty()) {

        const DisplayHardware& hw(graphicPlane(0).displayHardware());

        const nsecs_t now = systemTime();

libs/utils/ResourceTypes.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1743,7 +1743,7 @@ bool ResTable::getResourceName(uint32_t resID, resource_name* outName) const 
        if (Res_GETPACKAGE(resID)+1 == 0) {

            LOGW("No package identifier when getting name for resource number 0x%08x", resID);

        } else {

            LOGW("Resources don't contain pacakge for resource number 0x%08x", resID);

            LOGW("Resources don't contain package for resource number 0x%08x", resID);

        }

        return false;

    }
@@ -1793,7 +1793,7 @@ ssize_t ResTable::getResource(uint32_t resID, Res_value* outValue, bool mayBeBag 
        if (Res_GETPACKAGE(resID)+1 == 0) {

            LOGW("No package identifier when getting name for resource number 0x%08x", resID);

        } else {

            LOGW("Resources don't contain pacakge for resource number 0x%08x", resID);

            LOGW("Resources don't contain package for resource number 0x%08x", resID);

        }

        return BAD_INDEX;

    }

opengl/libagl/egl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -952,7 +952,8 @@ static config_pair_t const config_base_attribute_list[] = { 
        { EGL_BIND_TO_TEXTURE_RGBA,       EGL_FALSE                         },

        { EGL_BIND_TO_TEXTURE_RGB,        EGL_FALSE                         },

        { EGL_MIN_SWAP_INTERVAL,          1                                 },

        { EGL_MAX_SWAP_INTERVAL,          4                                 },

        { EGL_MAX_SWAP_INTERVAL,          1                                 },

        { EGL_RENDERABLE_TYPE,            EGL_OPENGL_ES_BIT                 },

};



// These configs can override the base attribute list