Merge "Fix CacheBitmap crash issue when using H/W UI rendering" (5c09d605) · Commits · e / os / android_frameworks_base

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;