summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-29 12:12:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-29 12:12:27 +0000
commitd4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3 (patch)
treef96235fc1f35db39a7522b860a59ffe9ede1abcf /graphics/java
parent887b1ca87941095797a246b2d68ec2626a7cfc43 (diff)
parenta2f9042f4eec167bad04ba8923723cd9458699b5 (diff)
downloadframeworks_base-d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3.zip
frameworks_base-d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3.tar.gz
frameworks_base-d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3.tar.bz2
Merge "AArch64: Use long for pointers in graphics/Interpolator"
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/Interpolator.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics/java/android/graphics/Interpolator.java b/graphics/java/android/graphics/Interpolator.java
index 75851a6..f695a9e 100644
--- a/graphics/java/android/graphics/Interpolator.java
+++ b/graphics/java/android/graphics/Interpolator.java
@@ -151,13 +151,13 @@ public class Interpolator {
private int mValueCount;
private int mFrameCount;
- private final int native_instance;
+ private final long native_instance;
- private static native int nativeConstructor(int valueCount, int frameCount);
- private static native void nativeDestructor(int native_instance);
- private static native void nativeReset(int native_instance, int valueCount, int frameCount);
- private static native void nativeSetKeyFrame(int native_instance, int index, int msec, float[] values, float[] blend);
- private static native void nativeSetRepeatMirror(int native_instance, float repeatCount, boolean mirror);
- private static native int nativeTimeToValues(int native_instance, int msec, float[] values);
+ private static native long nativeConstructor(int valueCount, int frameCount);
+ private static native void nativeDestructor(long native_instance);
+ private static native void nativeReset(long native_instance, int valueCount, int frameCount);
+ private static native void nativeSetKeyFrame(long native_instance, int index, int msec, float[] values, float[] blend);
+ private static native void nativeSetRepeatMirror(long native_instance, float repeatCount, boolean mirror);
+ private static native int nativeTimeToValues(long native_instance, int msec, float[] values);
}