summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabrice Di Meglio <fdimeglio@google.com> 2012-01-06 14:20:41 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-06 14:20:41 -0800
commit42e231bf4a9995c334fa134aa21f859fa1f719fc (patch)
tree04e06c188bb44e465fbd050faa37cf468766408b
parentbc72272cc07398a5dd6d7c76fb3eac91ad3e2bd8 (diff)
parentc1d03cff271d81fc9948648583e9e07c0c624dc1 (diff)
am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
* commit 'c1d03cff271d81fc9948648583e9e07c0c624dc1': Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
-rw-r--r--core/jni/android/graphics/TextLayoutCache.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index 662d9187ed90..4f90bbf3fdc8 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -172,7 +172,6 @@ sp<TextLayoutCacheValue> TextLayoutCache::getValue(SkPaint* paint,
start, count, contextCount, size, mMaxSize - mSize, endTime,
String8(text, count).string());
}
- value.clear();
}
} else {
// This is a cache hit, just log timestamp and user infos