Skip to content

Commit ee30963

Browse files
committed
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: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Jackie Wu <jackie.wu@intel.com> Signed-off-by: Liang Chen <liang.l.chen@intel.com> Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
1 parent bfe1ab8 commit ee30963

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

libs/hwui/FontRenderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp
617617
uint32_t* retOriginX, uint32_t* retOriginY) {
618618
cachedGlyph->mIsValid = false;
619619
// If the glyph is too tall, don't cache it
620-
if (glyph.fHeight + TEXTURE_BORDER_SIZE > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) {
620+
if (mCacheLines.size() != 0 && (glyph.fHeight + TEXTURE_BORDER_SIZE > mCacheLines[mCacheLines.size() - 1]->mMaxHeight)) {
621621
ALOGE("Font size to large to fit in cache. width, height = %i, %i",
622622
(int) glyph.fWidth, (int) glyph.fHeight);
623623
return;

0 commit comments

Comments
 (0)