summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-01-06 14:19:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-06 14:19:20 -0800
commitc1d03cff271d81fc9948648583e9e07c0c624dc1 (patch)
tree04e06c188bb44e465fbd050faa37cf468766408b /core
parentbeb8be60d157e4812e0195c2e445aa0abb82d9a2 (diff)
parenta0a117b4c1a9e45ca4b895df9a355b6922ae2242 (diff)
downloadframeworks_base-c1d03cff271d81fc9948648583e9e07c0c624dc1.zip
frameworks_base-c1d03cff271d81fc9948648583e9e07c0c624dc1.tar.gz
frameworks_base-c1d03cff271d81fc9948648583e9e07c0c624dc1.tar.bz2
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
Diffstat (limited to 'core')
-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 662d918..4f90bbf 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