commit ab0efa17faad99b974626ae2107a1efaaeda6f73
author Hans Boehm <hboehm@google.com> Tue Mar 12 21:07:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 12 21:07:03 2019 +0000
tree a41f1009b0fe78d7c794b048e51e2da3c2734cf5
parent 8877468232e56c678939ef5485ee17c51192da29
parent b58d0bab57c7d4ff115dab55c065c6012bbfe5c8

Merge "Correct registerNativeAllocation type"

support/java/src/android/support/v8/renderscript/RenderScript.java

diff --git a/support/java/src/android/support/v8/renderscript/RenderScript.java b/support/java/src/android/support/v8/renderscript/RenderScript.java
index 13c5dc2..bd0c78b 100644
--- a/support/java/src/android/support/v8/renderscript/RenderScript.java
+++ b/support/java/src/android/support/v8/renderscript/RenderScript.java
@@ -1391,8 +1391,10 @@
                     Class<?> vm_runtime = Class.forName("dalvik.system.VMRuntime");
                     Method get_runtime = vm_runtime.getDeclaredMethod("getRuntime");
                     sRuntime = get_runtime.invoke(null);
-                    registerNativeAllocation = vm_runtime.getDeclaredMethod("registerNativeAllocation", Integer.TYPE);
-                    registerNativeFree = vm_runtime.getDeclaredMethod("registerNativeFree", Integer.TYPE);
+                    Class<?> argClass = android.os.Build.VERSION.SDK_INT >= 29 ? Long.TYPE : Integer.TYPE;
+                    // The int version is (so far) always defined, but deprecated for APIs >= 29.
+                    registerNativeAllocation = vm_runtime.getDeclaredMethod("registerNativeAllocation", argClass);
+                    registerNativeFree = vm_runtime.getDeclaredMethod("registerNativeFree", argClass);
                     sUseGCHooks = true;
                 } catch (Exception e) {
                     Log.e(LOG_TAG, "No GC methods");