am f1f0c87: Fix bug in TextLayoutCacheKey handling embedded nulls.

Jeff Brown · Android Git Automerger · commit 6f0464e79d6d · 2011-11-11T19:22:04.000-08:00
* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
diff --git 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);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ TextLayoutCacheKey::TextLayoutCacheKey(const TextLayoutCacheKey& other) :`
`249`	`249`	`flags(other.flags),`
`250`	`250`	`hinting(other.hinting) {`
`251`	`251`	`if (other.text) {`
`252`		`- textCopy.setTo(other.text);`
	`252`	`+ textCopy.setTo(other.text, other.contextCount);`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`