summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2012-08-03 16:06:55 -0700
committer Romain Guy <romainguy@google.com> 2012-08-03 16:08:56 -0700
commit18edb81172daa9b98b53d226d94fc03249b1aded (patch)
treea660ac4ee7f21e7becfc2b707425f762e96345da
parentb92edf99ef268fe0fd76445286d720bd11f967d2 (diff)
Avoid crash when dumping display lists
We recently changed the drawText implementation to accept more parameters which were not taken into account during a dump operation. Change-Id: Ia1dc682dc7bb2bb02a1f4a514ed5af5556f92a97
-rw-r--r--libs/hwui/DisplayListRenderer.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp
index 76321be271d3..95fc2c5b797d 100644
--- a/libs/hwui/DisplayListRenderer.cpp
+++ b/libs/hwui/DisplayListRenderer.cpp
@@ -595,10 +595,13 @@ void DisplayList::output(OpenGLRenderer& renderer, uint32_t level) {
break;
case DrawText: {
getText(&text);
- int count = getInt();
- int positionsCount = 0;
+ int32_t count = getInt();
+ float x = getFloat();
+ float y = getFloat();
+ int32_t positionsCount = 0;
float* positions = getFloats(positionsCount);
SkPaint* paint = getPaint(renderer);
+ float length = getFloat();
ALOGD("%s%s %s, %d, %d, %p", (char*) indent, OP_NAMES[op],
text.text(), text.length(), count, paint);
}