| commit | 5fc1dd15f51a52dc4e233022047c0ab2681481e7 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Tue Nov 02 17:26:24 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 02 17:26:24 2010 -0700 |
| tree | 7a6b21c5f3f41b29b4eb14c7a81f18ed674c0318 | |
| parent | e113710ebd10c254ed54171b64e8557298ded34e [diff] | |
| parent | 5d4f85bfce122cb48e5d9498aac3b8f3259582cc [diff] |
Merge "Use SystemProperties.get() instead of System.getProperty()"
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp index 12db908..1994f6a 100644 --- a/libs/ui/Region.cpp +++ b/libs/ui/Region.cpp
@@ -289,7 +289,7 @@ void flushSpan() { bool merge = false; if (tail-head == ssize_t(span.size())) { - Rect const* p = cur; + Rect const* p = span.editArray(); Rect const* q = head; if (p->top == q->bottom) { merge = true;