summaryrefslogtreecommitdiffstats
path: root/graphics/java/android
diff options
context:
space:
mode:
authorMike Klein <mtklein@google.com>2013-10-07 15:16:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-07 15:16:03 -0700
commitbd03b9f17fca6df7ed305cbe14b995032d461ffa (patch)
tree68190dd572db5631393799d917d844dab754fab4 /graphics/java/android
parentfe2ed8859a9c58d33d96c3557d94dc6fcde08257 (diff)
parent3dd81450be76ef4b1d8737ec4bce34e7415a60e3 (diff)
downloadframeworks_base-bd03b9f17fca6df7ed305cbe14b995032d461ffa.zip
frameworks_base-bd03b9f17fca6df7ed305cbe14b995032d461ffa.tar.gz
frameworks_base-bd03b9f17fca6df7ed305cbe14b995032d461ffa.tar.bz2
am 3dd81450: am aa24442e: am d0f379c1: Preserve fill type in Path.reset().
* commit '3dd81450be76ef4b1d8737ec4bce34e7415a60e3': Preserve fill type in Path.reset().
Diffstat (limited to 'graphics/java/android')
-rw-r--r--graphics/java/android/graphics/Path.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java
index ef858eb..5b04a91 100644
--- a/graphics/java/android/graphics/Path.java
+++ b/graphics/java/android/graphics/Path.java
@@ -78,7 +78,11 @@ public class Path {
mLastDirection = null;
if (rects != null) rects.setEmpty();
}
+ // We promised not to change this, so preserve it around the native
+ // call, which does now reset fill type.
+ final FillType fillType = getFillType();
native_reset(mNativePath);
+ setFillType(fillType);
}
/**