diff options
author | Hans Boehm <hboehm@google.com> | 2021-03-08 21:24:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-08 21:24:00 +0000 |
commit | e8d010e9ec98449cf97e58c3dd5fc504800192c2 (patch) | |
tree | 94d3e4f85b5af0d1c1d0cb571f970307a76565d4 /rs/java/android/renderscript/RenderScript.java | |
parent | fda49eb9a34ee637a5f01860dcaf0a4986bd2c35 (diff) | |
parent | 0272e96327f70ad35fad3efb2e46b5a7ef986e0a (diff) |
Merge "No longer call registerNativeAllocation" am: 0272e96327
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621426
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I84dd87405e09cbdf32a8fa0898a7c68069802958
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 39efe731ce8a..806a25a748e2 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -1363,13 +1363,6 @@ public class RenderScript { mApplicationContext = ctx.getApplicationContext(); } mRWLock = new ReentrantReadWriteLock(); - try { - registerNativeAllocation.invoke(sRuntime, 4 * 1024 * 1024); // 4MB for GC sake - } catch (Exception e) { - Log.e(RenderScript.LOG_TAG, "Couldn't invoke registerNativeAllocation:" + e); - throw new RSRuntimeException("Couldn't invoke registerNativeAllocation:" + e); - } - } /** |