diff options
| author | Hans Boehm <hboehm@google.com> | 2021-03-08 22:40:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-08 22:40:57 +0000 |
| commit | be1e8edca3c5023b52b7a95bf194dce60bd72b5c (patch) | |
| tree | 13274e23f6d23baf79fa8a9f03d6683a1c82e710 /rs/java/android/renderscript/RenderScript.java | |
| parent | 4fadd2013f84826069344a25409dd50780bcc21a (diff) | |
| parent | 0c42ad0ca7b1d4659a1b53adaac32a45d7260126 (diff) | |
Merge "No longer call registerNativeAllocation" am: 0272e96327 am: e8d010e9ec am: 0c42ad0ca7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621426
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34d58d2399064b5f66c4f6bfcdb8743bbae25685
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); - } - } /** |