diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-11-11 19:22:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-11 19:22:04 -0800 |
| commit | 6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f (patch) | |
| tree | 34669cb409a401e87c84f28467d5a3c0f9d5c3a3 | |
| parent | 771d0c99f6433c3ad7063cdfa847c9476ef0453c (diff) | |
| parent | f1f0c873b1d119a19342cb67ca77b59607951659 (diff) | |
| download | frameworks_base-6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f.zip frameworks_base-6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f.tar.gz frameworks_base-6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f.tar.bz2 | |
am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index 79aa43b..7076e2a 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -249,7 +249,7 @@ TextLayoutCacheKey::TextLayoutCacheKey(const TextLayoutCacheKey& other) : flags(other.flags), hinting(other.hinting) { if (other.text) { - textCopy.setTo(other.text); + textCopy.setTo(other.text, other.contextCount); } } |