From da3cee60c5291c1e6d0188cd52c8f8718ebf6acd Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Mon, 11 Feb 2019 11:01:03 -0800 Subject: Correct registerNativeAllocation type We're changing the argument type to long, since it should be roughly large enough to hold a size_t everywhere. Make style checker happy by reordering imports. Test: Treehugger Change-Id: Iccdc5fa592f56d448817f7762af1cff27b4fc2a8 --- rs/java/android/renderscript/RenderScript.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'rs/java/android') diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 429315782a63..85c82bc009a0 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -16,12 +16,6 @@ package android.renderscript; -import java.io.File; -import java.lang.reflect.Method; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.concurrent.locks.ReentrantReadWriteLock; - import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.AssetManager; @@ -32,6 +26,12 @@ import android.os.Trace; import android.util.Log; import android.view.Surface; +import java.io.File; +import java.lang.reflect.Method; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.concurrent.locks.ReentrantReadWriteLock; + // TODO: Clean up the whitespace that separates methods in this class. /** @@ -114,8 +114,9 @@ public class RenderScript { 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); + registerNativeAllocation = + vm_runtime.getDeclaredMethod("registerNativeAllocation", Long.TYPE); + registerNativeFree = vm_runtime.getDeclaredMethod("registerNativeFree", Long.TYPE); } catch (Exception e) { Log.e(LOG_TAG, "Error loading GC methods: " + e); throw new RSRuntimeException("Error loading GC methods: " + e); -- cgit v1.2.3-59-g8ed1b