diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-29 15:48:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-29 15:48:11 +0000 |
commit | 1e7011fb2903b6b10a78890b2f85ca026e49b168 (patch) | |
tree | cc38b241871029e9640b6427fd3e0ed72e8b4af1 /graphics/java | |
parent | 9932d648834a8fae4f98e6985ce1112ddf28da0b (diff) | |
parent | e55bc7f1575fc5dacac70c4cb209e6aa0c582e71 (diff) | |
download | frameworks_base-1e7011fb2903b6b10a78890b2f85ca026e49b168.zip frameworks_base-1e7011fb2903b6b10a78890b2f85ca026e49b168.tar.gz frameworks_base-1e7011fb2903b6b10a78890b2f85ca026e49b168.tar.bz2 |
Merge "Path.native_trim should return long, not int."
Diffstat (limited to 'graphics/java')
-rw-r--r-- | graphics/java/android/graphics/Path.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 5ac3f85..def1db6 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -875,7 +875,7 @@ public class Path { private static native boolean native_op(long path1, long path2, int op, long result); private static native void finalizer(long nPath); private static native float[] native_approximate(long nPath, float error); - private static native int native_trim(long nPath, long nTargetPath, long nPathMeasure, + private static native long native_trim(long nPath, long nTargetPath, long nPathMeasure, float trimStart, float trimEnd, float trimOffset); private static native void native_destroyMeasure(long nPathMeasure); } |