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

Commit ee309635 authored by Jun Tian's avatar Jun Tian
Browse files

Fix CacheBitmap crash issue when using H/W UI rendering 



Avoid to access invalid index in CacheBitmap. That will cause the android SDK image cannot be booted up
with H/W GL enabling. This patch is required by both ARM and x86 SDK system image.

Change-Id: I705b7f06915a2338a2f94509486344bfd92b4bfb
Signed-off-by: default avatarJun Tian <jun.j.tian@intel.com>
Signed-off-by: default avatarJackie Wu <jackie.wu@intel.com>
Signed-off-by: default avatarLiang Chen <liang.l.chen@intel.com>
Signed-off-by: default avatarPanfeng Chang <panfengx.chang@intel.com>
parent bfe1ab82

libs/hwui/FontRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp 
        uint32_t* retOriginX, uint32_t* retOriginY) {

    cachedGlyph->mIsValid = false;

    // If the glyph is too tall, don't cache it

    if (glyph.fHeight + TEXTURE_BORDER_SIZE > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) {

    if (mCacheLines.size() != 0  && (glyph.fHeight + TEXTURE_BORDER_SIZE > mCacheLines[mCacheLines.size() - 1]->mMaxHeight)) {

        ALOGE("Font size to large to fit in cache. width, height = %i, %i",

                (int) glyph.fWidth, (int) glyph.fHeight);

        return;