summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-01-31 12:17:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-31 12:17:09 +0000
commit5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72 (patch)
tree14f352797083eea6db015b1d4f2e4f0ab81e90f8 /tools/layoutlib
parent133c9649c3c83e6ccefa4f46c162ddb3f55269d0 (diff)
parent70986e197bbaf4de4f8126519a75df2b057c3b52 (diff)
downloadframeworks_base-5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72.zip
frameworks_base-5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72.tar.gz
frameworks_base-5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72.tar.bz2
am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '70986e197bbaf4de4f8126519a75df2b057c3b52': AArch64: Use of long for pointers in PropertyValuesHolder
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java b/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java
index 7b444aa..224eac6 100644
--- a/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/animation/PropertyValuesHolder_Delegate.java
@@ -36,24 +36,24 @@ import com.android.tools.layoutlib.annotations.LayoutlibDelegate;
/*package*/ class PropertyValuesHolder_Delegate {
@LayoutlibDelegate
- /*package*/ static int nGetIntMethod(Class<?> targetClass, String methodName) {
+ /*package*/ static long nGetIntMethod(Class<?> targetClass, String methodName) {
// return 0 to force PropertyValuesHolder to use Java reflection.
return 0;
}
@LayoutlibDelegate
- /*package*/ static int nGetFloatMethod(Class<?> targetClass, String methodName) {
+ /*package*/ static long nGetFloatMethod(Class<?> targetClass, String methodName) {
// return 0 to force PropertyValuesHolder to use Java reflection.
return 0;
}
@LayoutlibDelegate
- /*package*/ static void nCallIntMethod(Object target, int methodID, int arg) {
+ /*package*/ static void nCallIntMethod(Object target, long methodID, int arg) {
// do nothing
}
@LayoutlibDelegate
- /*package*/ static void nCallFloatMethod(Object target, int methodID, float arg) {
+ /*package*/ static void nCallFloatMethod(Object target, long methodID, float arg) {
// do nothing
}
}